ati-drivers: bump version to 14.4

Changed files
+5 -23
pkgs
os-specific
+2 -2
pkgs/os-specific/linux/ati-drivers/builder.sh
···
# custom unpack:
unzip $src
-
run_file=$(echo amd-catalyst-*)
+
run_file=$(echo fglrx-*/amd-driver-installer-*)
sh $run_file --extract .
eval "$patchPhase"
···
}
setModVersions(){
-
! grep CONFIG_MODVERSIONS=y $kernel/config ||
+
! grep CONFIG_MODVERSIONS=y $kernelBuild/.config ||
def_modversions="-DMODVERSIONS"
# make.sh contains much more code to determine this whether its enabled
}
+3 -3
pkgs/os-specific/linux/ati-drivers/default.nix
···
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation {
-
name = "ati-drivers-13.12-${kernel.version}";
+
name = "ati-drivers-14.4-${kernel.version}";
builder = ./builder.sh;
···
gcc = stdenv.gcc.gcc;
src = fetchurl {
-
url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip;
-
sha256 = "1c3fn328340by4qn99dgfj8c2q34fxdb2alcak0vnyc6bw7l5sms";
+
url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip;
+
sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
};
-18
pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
···
+# 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;
-
}