tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
ati-drivers: bump version to 14.4
Nathaniel Baxter
11 years ago
9a48f9d1
4ead67b7
+5
-23
3 changed files
expand all
collapse all
unified
split
pkgs
os-specific
linux
ati-drivers
builder.sh
default.nix
gentoo-patches.patch
+2
-2
pkgs/os-specific/linux/ati-drivers/builder.sh
···
8
9
# custom unpack:
10
unzip $src
11
-
run_file=$(echo amd-catalyst-*)
12
sh $run_file --extract .
13
14
eval "$patchPhase"
···
60
}
61
62
setModVersions(){
63
-
! grep CONFIG_MODVERSIONS=y $kernel/config ||
64
def_modversions="-DMODVERSIONS"
65
# make.sh contains much more code to determine this whether its enabled
66
}
···
8
9
# custom unpack:
10
unzip $src
11
+
run_file=$(echo fglrx-*/amd-driver-installer-*)
12
sh $run_file --extract .
13
14
eval "$patchPhase"
···
60
}
61
62
setModVersions(){
63
+
! grep CONFIG_MODVERSIONS=y $kernelBuild/.config ||
64
def_modversions="-DMODVERSIONS"
65
# make.sh contains much more code to determine this whether its enabled
66
}
+3
-3
pkgs/os-specific/linux/ati-drivers/default.nix
···
26
assert stdenv.system == "x86_64-linux";
27
28
stdenv.mkDerivation {
29
-
name = "ati-drivers-13.12-${kernel.version}";
30
31
builder = ./builder.sh;
32
···
34
gcc = stdenv.gcc.gcc;
35
36
src = fetchurl {
37
-
url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip;
38
-
sha256 = "1c3fn328340by4qn99dgfj8c2q34fxdb2alcak0vnyc6bw7l5sms";
39
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
40
};
41
···
26
assert stdenv.system == "x86_64-linux";
27
28
stdenv.mkDerivation {
29
+
name = "ati-drivers-14.4-${kernel.version}";
30
31
builder = ./builder.sh;
32
···
34
gcc = stdenv.gcc.gcc;
35
36
src = fetchurl {
37
+
url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip;
38
+
sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk";
39
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
40
};
41
-18
pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
···
31
+# endif
32
#endif
33
}
34
-
35
-
36
-
diff -urN a/common/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
37
-
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:32:34.734832283 +0100
38
-
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:33:31.849831765 +0100
39
-
@@ -1002,7 +1002,11 @@
40
-
#endif
41
-
{
42
-
return KCL_ACPI_ERROR;
43
-
- }
44
-
+ }
45
-
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
46
-
+ ((acpi_tbl_table_handler)handler)(hdr);
47
-
+#else
48
-
((acpi_table_handler)handler)(hdr);
49
-
+#endif
50
-
return KCL_ACPI_OK;
51
-
}
···
31
+# endif
32
#endif
33
}
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0