diff options
| author | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2014-09-04 13:11:30 +1000 |
|---|---|---|
| committer | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2014-09-07 12:40:24 +1000 |
| commit | 9a48f9d1b6656683c7450eecd839012ca424f556 (patch) | |
| tree | e972c85d6343923562e14d7ec9ee9939d19f4307 /pkgs/os-specific | |
| parent | 4ead67b785fc666aaebaa3958b034dca28d61f19 (diff) | |
| download | nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.tar nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.tar.gz nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.tar.bz2 nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.tar.lz nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.tar.xz nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.tar.zst nixpkgs-9a48f9d1b6656683c7450eecd839012ca424f556.zip | |
ati-drivers: bump version to 14.4
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch | 18 |
3 files changed, 5 insertions, 23 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index d1ca1b35452..ab347d976a5 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -8,7 +8,7 @@ die(){ echo $@; exit 1; } # custom unpack: unzip $src -run_file=$(echo amd-catalyst-*) +run_file=$(echo fglrx-*/amd-driver-installer-*) sh $run_file --extract . eval "$patchPhase" @@ -60,7 +60,7 @@ setSMP(){ } 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 } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 0aa67dba237..0da2d26c356 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -26,7 +26,7 @@ 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; @@ -34,8 +34,8 @@ stdenv.mkDerivation { 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"; }; diff --git a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch index 392c2a8c29e..fd1d12cccb6 100644 --- a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch +++ b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch @@ -31,21 +31,3 @@ index d3ad3ce..9362b58 100755 +# 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; - } |