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

primus: propagate stdenv to primusLibs

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-03-31 19:51:15 +03:00
parent 9134f9358a
commit 9b7edbeb2f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/X11/primus/default.nix
View File

@ -4,6 +4,7 @@
# same LD_LIBRARY_PATH. # same LD_LIBRARY_PATH.
# Other distributions do the same. # Other distributions do the same.
{ stdenv { stdenv
, stdenv_i686
, primusLib , primusLib
, writeScriptBin , writeScriptBin
, primusLib_i686 ? null , primusLib_i686 ? null
@ -11,8 +12,12 @@
}: }:
let let
primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; # We override stdenv in case we need different ABI for libGL
primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; 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); ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686);
in writeScriptBin "primusrun" '' in writeScriptBin "primusrun" ''

1
pkgs/top-level/all-packages.nix
View File

@ -14082,6 +14082,7 @@ in
}; };
primus = callPackage ../tools/X11/primus { primus = callPackage ../tools/X11/primus {
stdenv_i686 = pkgsi686Linux.stdenv;
primusLib_i686 = if system == "x86_64-linux" primusLib_i686 = if system == "x86_64-linux"
then pkgsi686Linux.primusLib then pkgsi686Linux.primusLib
else null; else null;