MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ati-driver: Bump version to 14.12

Browse source
This commit is contained in:
Jascha Geerds 2014-12-10 21:12:54 +01:00
parent 0b1d16cff2
commit 3525f7135f
3 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/os-specific/linux/ati-drivers/builder.sh
View file

@ -224,6 +224,7 @@ fi
# libstdc++ and gcc are needed by some libs
patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so
patchelf --set-rpath $gcc/$lib_arch $out/lib/xorg/modules/glesx.so
}
if test -z "$libsOnly"; then

7
pkgs/os-specific/linux/ati-drivers/default.nix
View file

@ -31,7 +31,7 @@ assert (!libsOnly) -> kernel != null;
with stdenv.lib;
stdenv.mkDerivation {
name = "ati-drivers-14.4" + (optionalString (!libsOnly) "-${kernel.version}");
name = "ati-drivers-14.12" + (optionalString (!libsOnly) "-${kernel.version}");
builder = ./builder.sh;
@ -39,13 +39,12 @@ stdenv.mkDerivation {
gcc = stdenv.gcc.gcc;
src = fetchurl {
url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip;
sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk";
url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip;
sha256 = "0jd2scrdlyapynxfjdrarnwcdzxjqrk5fg5i10g3bm0ay8v9hrk8";
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
};
# most patches are taken from gentoo
patchPhase = "patch -p1 < ${./gentoo-patches.patch}";
patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
buildInputs =

33
pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
View file

@ -1,33 +0,0 @@
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index d3ad3ce..9362b58 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -34,6 +34,11 @@
#include <linux/autoconf.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
+#include <linux/uidgid.h>
+#endif
+
+
#if !defined(CONFIG_X86)
#if !defined(CONFIG_X86_PC)
#if !defined(CONFIG_X86_XEN)
@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
{
#ifdef current_euid
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
+ return __kuid_val(current_euid());
+# else
return current_euid();
+# endif
#else
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
+ return __kuid_val(current->euid);
+# else
return current->euid;
+# endif
#endif
}