tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
treewide: fix darwin builds by referring to stdenv's libc
Franz Pletz
9 years ago
df275f5b
447207d2
+6
-6
6 changed files
expand all
collapse all
unified
split
pkgs
applications
networking
ike
default.nix
science
logic
boolector
default.nix
development
tools
misc
prelink
default.nix
os-specific
linux
busybox
default.nix
sinit
default.nix
tools
backup
partclone
default.nix
+1
-1
pkgs/applications/networking/ike/default.nix
···
33
installPhase = ''
34
make install
35
for file in "$out"/bin/* "$out"/sbin/*; do
36
-
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.glibc libedit qt4 ]}"
37
done
38
'';
39
···
33
installPhase = ''
34
make install
35
for file in "$out"/bin/* "$out"/sbin/*; do
36
+
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}"
37
done
38
'';
39
+1
-1
pkgs/applications/science/logic/boolector/default.nix
···
23
license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
24
in
25
stdenv.mkDerivation (boolectorPkg // {
26
-
buildInputs = [ zlib stdenv.glibc.static zlib.static ];
27
enableParallelBuilding = false;
28
29
installPhase = ''
···
23
license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
24
in
25
stdenv.mkDerivation (boolectorPkg // {
26
+
buildInputs = [ zlib stdenv.cc.libc.static zlib.static ];
27
enableParallelBuilding = false;
28
29
installPhase = ''
+1
-1
pkgs/development/tools/misc/prelink/default.nix
···
6
stdenv.mkDerivation rec {
7
name = "prelink-${version}";
8
9
-
buildInputs = [ libelf stdenv.glibc stdenv.glibc.static ];
10
11
src = fetchurl {
12
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
···
6
stdenv.mkDerivation rec {
7
name = "prelink-${version}";
8
9
+
buildInputs = [ libelf stdenv.cc.libc stdenv.cc.libc.static ];
10
11
src = fetchurl {
12
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
+1
-1
pkgs/os-specific/linux/busybox/default.nix
···
74
makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
75
'';
76
77
-
buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ];
78
79
crossAttrs = {
80
extraCrossConfig = ''
···
74
makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
75
'';
76
77
+
buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];
78
79
crossAttrs = {
80
extraCrossConfig = ''
+1
-1
pkgs/os-specific/linux/sinit/default.nix
···
10
rev = "refs/tags/v${version}";
11
};
12
buildInputs = [
13
-
stdenv.glibc.static
14
];
15
in
16
stdenv.mkDerivation {
···
10
rev = "refs/tags/v${version}";
11
};
12
buildInputs = [
13
+
stdenv.cc.libc.static
14
];
15
in
16
stdenv.mkDerivation {
+1
-1
pkgs/tools/backup/partclone/default.nix
···
14
};
15
16
nativeBuildInputs = [ autoreconfHook pkgconfig ];
17
-
buildInputs = [ e2fsprogs libuuid stdenv.glibc stdenv.glibc.static ];
18
19
enableParallelBuilding = true;
20
···
14
};
15
16
nativeBuildInputs = [ autoreconfHook pkgconfig ];
17
+
buildInputs = [ e2fsprogs libuuid stdenv.cc.libc stdenv.cc.libc.static ];
18
19
enableParallelBuilding = true;
20