tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
primus: propagate stdenv to primusLibs
Nikolay Amiantov
10 years ago
9b7edbeb
9134f935
+8
-2
2 changed files
expand all
collapse all
unified
split
pkgs
tools
X11
primus
default.nix
top-level
all-packages.nix
+7
-2
pkgs/tools/X11/primus/default.nix
···
4
4
# same LD_LIBRARY_PATH.
5
5
# Other distributions do the same.
6
6
{ stdenv
7
7
+
, stdenv_i686
7
8
, primusLib
8
9
, writeScriptBin
9
10
, primusLib_i686 ? null
···
11
12
}:
12
13
13
14
let
14
14
-
primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; };
15
15
-
primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; };
15
15
+
# We override stdenv in case we need different ABI for libGL
16
16
+
primusLib_ = primusLib.override { inherit stdenv; };
17
17
+
primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; };
18
18
+
19
19
+
primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
20
20
+
primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; };
16
21
ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686);
17
22
18
23
in writeScriptBin "primusrun" ''
+1
pkgs/top-level/all-packages.nix
···
14082
14082
};
14083
14083
14084
14084
primus = callPackage ../tools/X11/primus {
14085
14085
+
stdenv_i686 = pkgsi686Linux.stdenv;
14085
14086
primusLib_i686 = if system == "x86_64-linux"
14086
14087
then pkgsi686Linux.primusLib
14087
14088
else null;