diff options
author | Patrick Mahoney <pat@polycrystal.org> | 2017-03-26 17:30:41 -0500 |
---|---|---|
committer | Patrick Mahoney <pat@polycrystal.org> | 2017-03-26 17:30:41 -0500 |
commit | 09a5007797e96ae5d1b2318bb164ec9c81215561 (patch) | |
tree | ae82370e771008c100f1c58f6f46e13506ce6441 | |
parent | eab30996bd6a8ed2b74f49276146fab8c6d17597 (diff) | |
download | nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.tar nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.tar.gz nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.tar.bz2 nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.tar.lz nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.tar.xz nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.tar.zst nixlib-09a5007797e96ae5d1b2318bb164ec9c81215561.zip |
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.
-rw-r--r-- | pkgs/development/libraries/skalibs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/execline/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/s6-portable-utils/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/s6-dns/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/s6-networking/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/s6-rc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/s6/default.nix | 2 |
7 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 3c137872707c..b87662a6e342 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { # Explicitly setting target ensures code can be compiled against a skalibs # binary built on a different version of darwin. # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/skalibs/; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 6dbc2290f01e..5010343d3c71 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/execline/; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index c3156650551f..bf5a158625c5 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -13,17 +13,19 @@ stdenv.mkDerivation rec { dontDisableStatic = true; - nativeBuildInputs = [] - ++ optional stdenv.isDarwin gcc; - configureFlags = [ "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ]; - + ] + # On darwin, the target triplet from -dumpmachine includes version number, but + # skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 067f80c42a9f..8ea134843c3e 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-dns/; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 1ddd4fad4dc0..6574a02bb921 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6}/lib" "--with-dynlib=${s6Dns}/lib" ] - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-networking/; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 31c01409eb2d..763d44066685 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/s6-rc/; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 19045a8c790b..67acb8ac3dca 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${execline}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6/; |