ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 03:15:56 +03:00
Code Issues Projects Releases Wiki Activity

ati-drivers: bump version to 14.4

Browse Source
This commit is contained in:
Nathaniel Baxter 2014-09-04 13:11:30 +10:00
parent 4ead67b785
commit 9a48f9d1b6
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/ati-drivers/builder.sh
View File

@ -8,7 +8,7 @@ die(){ echo $@; exit 1; }
# custom unpack: # custom unpack:
unzip $src unzip $src
run_file=$(echo amd-catalyst-*) run_file=$(echo fglrx-*/amd-driver-installer-*)
sh $run_file --extract . sh $run_file --extract .
eval "$patchPhase" eval "$patchPhase"
@ -60,7 +60,7 @@ setSMP(){
} }
setModVersions(){ setModVersions(){
! grep CONFIG_MODVERSIONS=y $kernel/config || ! grep CONFIG_MODVERSIONS=y $kernelBuild/.config ||
def_modversions="-DMODVERSIONS" def_modversions="-DMODVERSIONS"
# make.sh contains much more code to determine this whether its enabled # make.sh contains much more code to determine this whether its enabled
} }

6
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@ -26,7 +26,7 @@
assert stdenv.system == "x86_64-linux"; assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ati-drivers-13.12-${kernel.version}"; name = "ati-drivers-14.4-${kernel.version}";
builder = ./builder.sh; builder = ./builder.sh;
@ -34,8 +34,8 @@ stdenv.mkDerivation {
gcc = stdenv.gcc.gcc; gcc = stdenv.gcc.gcc;
src = fetchurl { src = fetchurl {
url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip; url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip;
sha256 = "1c3fn328340by4qn99dgfj8c2q34fxdb2alcak0vnyc6bw7l5sms"; sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
}; };

18
pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
View File

@ -31,21 +31,3 @@ index d3ad3ce..9362b58 100755
+# endif +# endif
#endif #endif
} }
diff -urN a/common/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:32:34.734832283 +0100
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:33:31.849831765 +0100
@@ -1002,7 +1002,11 @@
#endif
{
return KCL_ACPI_ERROR;
- }
+ }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
+ ((acpi_tbl_table_handler)handler)(hdr);
+#else
((acpi_table_handler)handler)(hdr);
+#endif
return KCL_ACPI_OK;
}