pyrox.dev
lol
skarnet.org packages: fix darwin build
The configure scripts have been changed so that `--build` is now the
way to specify (non-cross compiling) build target, which is necessary
on darwin for binary compatibility across darwin versions.
+13
-11
+1
-1
pkgs/development/libraries/skalibs/default.nix
+1
-1
pkgs/development/libraries/skalibs/default.nix
···
30
30
# Explicitly setting target ensures code can be compiled against a skalibs
31
31
# binary built on a different version of darwin.
32
32
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
33
-
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
33
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
34
34
35
35
meta = {
36
36
homepage = http://skarnet.org/software/skalibs/;
+1
-1
pkgs/tools/misc/execline/default.nix
+1
-1
pkgs/tools/misc/execline/default.nix
···
28
28
"--with-dynlib=${skalibs}/lib"
29
29
]
30
30
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
31
-
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
31
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
32
32
33
33
meta = {
34
34
homepage = http://skarnet.org/software/execline/;
+7
-5
pkgs/tools/misc/s6-portable-utils/default.nix
+7
-5
pkgs/tools/misc/s6-portable-utils/default.nix
···
13
13
14
14
dontDisableStatic = true;
15
15
16
-
nativeBuildInputs = []
17
-
++ optional stdenv.isDarwin gcc;
18
-
19
16
configureFlags = [
20
17
"--enable-absolute-paths"
21
18
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
22
19
"--with-include=${skalibs}/include"
23
20
"--with-lib=${skalibs}/lib"
24
21
"--with-dynlib=${skalibs}/lib"
25
-
];
26
-
22
+
]
23
+
# On darwin, the target triplet from -dumpmachine includes version number, but
24
+
# skarnet.org software uses the triplet to test binary compatibility.
25
+
# Explicitly setting target ensures code can be compiled against a skalibs
26
+
# binary built on a different version of darwin.
27
+
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
28
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
27
29
28
30
meta = {
29
31
homepage = http://www.skarnet.org/software/s6-portable-utils/;
+1
-1
pkgs/tools/networking/s6-dns/default.nix
+1
-1
pkgs/tools/networking/s6-dns/default.nix
···
28
28
"--with-dynlib=${skalibs}/lib"
29
29
]
30
30
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
31
-
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
31
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
32
32
33
33
meta = {
34
34
homepage = http://www.skarnet.org/software/s6-dns/;
+1
-1
pkgs/tools/networking/s6-networking/default.nix
+1
-1
pkgs/tools/networking/s6-networking/default.nix
···
34
34
"--with-dynlib=${s6}/lib"
35
35
"--with-dynlib=${s6Dns}/lib"
36
36
]
37
-
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
37
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
38
38
39
39
meta = {
40
40
homepage = http://www.skarnet.org/software/s6-networking/;
+1
-1
pkgs/tools/system/s6-rc/default.nix
+1
-1
pkgs/tools/system/s6-rc/default.nix
···
32
32
"--with-dynlib=${s6}/lib"
33
33
]
34
34
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
35
-
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
35
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
36
36
37
37
meta = {
38
38
homepage = http://skarnet.org/software/s6-rc/;
+1
-1
pkgs/tools/system/s6/default.nix
+1
-1
pkgs/tools/system/s6/default.nix
···
29
29
"--with-dynlib=${execline}/lib"
30
30
]
31
31
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
32
-
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
32
+
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
33
33
34
34
meta = {
35
35
homepage = http://www.skarnet.org/software/s6/;