diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-10-21 01:30:13 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-10-21 01:30:13 +0200 |
| commit | ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f (patch) | |
| tree | 0da9286a75f2dad3d8a92a58b43219e71e97fc8b /pkgs/os-specific/linux | |
| parent | ac826c178f7e52b030eb085eb836f4fa48bd0b7d (diff) | |
| parent | d071a25dec43e5c4138b7a973b1055b9b1a4c0cb (diff) | |
| download | nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.tar nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.tar.gz nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.tar.bz2 nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.tar.lz nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.tar.xz nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.tar.zst nixlib-ea04d4a77c7f617c6b4f10f8d364695a14bc6b7f.zip | |
Merge pull request #4529 from geerds/ati-driver
ati-driver: Fix "Catalyst Control Center"
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index c91274c50bf1..325fb869a707 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -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 } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 45452c1ea6d2..11657d342917 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -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 = []; }; |