summary refs log tree commit diff
path: root/pkgs/tools/networking/s6-dns
diff options
context:
space:
mode:
authorPatrick Mahoney <pat@polycrystal.org>2016-04-01 10:20:13 -0500
committerPatrick Mahoney <pat@polycrystal.org>2016-04-01 10:39:37 -0500
commitfc1f5d2cf1a4febaa7843284554fd7397c8988bc (patch)
tree1c4243d174d8710685ed744e385d87d9e3b8e06f /pkgs/tools/networking/s6-dns
parente0c225857ffef4142f2478e7d3bda42b92446a8e (diff)
downloadnixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.tar
nixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.tar.gz
nixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.tar.bz2
nixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.tar.lz
nixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.tar.xz
nixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.tar.zst
nixpkgs-fc1f5d2cf1a4febaa7843284554fd7397c8988bc.zip
set target for darwin binary compat in skarnet.org packages
skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
Diffstat (limited to 'pkgs/tools/networking/s6-dns')
-rw-r--r--pkgs/tools/networking/s6-dns/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 653eee56f09..8715cb0c45c 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
     "--with-include=${skalibs}/include"
     "--with-lib=${skalibs}/lib"
     "--with-dynlib=${skalibs}/lib"
-  ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
+  ]
+  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-dns/;