diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-31 19:51:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-31 19:52:33 +0300 |
| commit | 9b7edbeb2f4e3494b3c466b5ed97652348b22b2f (patch) | |
| tree | 8803aa87011837547a62a8bf92997bfb9e6f01b2 /pkgs/tools/X11 | |
| parent | 9134f9358a934c9ad24d8e8d03d975af2626b114 (diff) | |
| download | nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.tar nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.tar.gz nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.tar.bz2 nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.tar.lz nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.tar.xz nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.tar.zst nixlib-9b7edbeb2f4e3494b3c466b5ed97652348b22b2f.zip | |
primus: propagate stdenv to primusLibs
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/primus/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f0a971dde18f..88589a058783 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -4,6 +4,7 @@ # same LD_LIBRARY_PATH. # Other distributions do the same. { stdenv +, stdenv_i686 , primusLib , writeScriptBin , primusLib_i686 ? null @@ -11,8 +12,12 @@ }: let - primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; - primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + # We override stdenv in case we need different ABI for libGL + primusLib_ = primusLib.override { inherit stdenv; }; + primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; }; + + primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); in writeScriptBin "primusrun" '' |