public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4529 from geerds/ati-driver 

ati-driver: Fix "Catalyst Control Center"
This commit is contained in:
Jaka Hudoklin 2014-10-21 01:30:13 +02:00
parent ac826c178f d071a25dec
commit ea04d4a77c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@ if test -z "$libsOnly"; then
cp $BIN/* $out/bin
for prog in $BIN/*; do
patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog)
wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$LD_LIBRARY_PATH
wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$gcc/lib:$qt4/lib:$LD_LIBRARY_PATH
done
}

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

@ -3,6 +3,7 @@
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
, unzip
, qt4 # for amdcccle
, # Whether to build the libraries only (i.e. not the kernel module or
# driver utils). Used to support 32-bit binaries on 64-bit
# Linux.
@ -53,6 +54,7 @@ stdenv.mkDerivation {
patchelf
unzip
mesa
qt4
];
inherit libsOnly;
@ -74,13 +76,13 @@ stdenv.mkDerivation {
# appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH
extraDRIlibs = [ xorg.libXext ];
inherit mesa; # only required to build examples
inherit mesa qt4; # only required to build examples and amdcccle
meta = with stdenv.lib; {
description = "ATI drivers";
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = licenses.unfree;
maintainers = with maintainers; [marcweber offline];
maintainers = with maintainers; [ marcweber offline jgeerds ];
platforms = platforms.linux;
hydraPlatforms = [];
};