summary refs log tree commit diff
path: root/pkgs/stdenv/adapters.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-12-04 21:12:17 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-12-04 21:12:17 -0600
commit8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc (patch)
treed198b62cdacab5b61759c528b3e784e5b7954321 /pkgs/stdenv/adapters.nix
parentb966d3c5835fdbaa153a9eacd08cdbf789ee1b40 (diff)
downloadnixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.tar
nixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.tar.gz
nixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.tar.bz2
nixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.tar.lz
nixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.tar.xz
nixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.tar.zst
nixpkgs-8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc.zip
stdenv/adapters.nix: fixup makeStaticBinaries
- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r--pkgs/stdenv/adapters.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 671306f6e6f..850785cd881 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -32,13 +32,15 @@ rec {
   # Return a modified stdenv that tries to build statically linked
   # binaries.
   makeStaticBinaries = stdenv: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_LINK = "-static";
+    { mkDerivation = args:
+      if stdenv.hostPlatform.isDarwin
+      then throw "Cannot build fully static binaries on Darwin/macOS"
+      else stdenv.mkDerivation (args // {
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static";
         configureFlags = (args.configureFlags or []) ++ [
             "--disable-shared" # brrr...
           ];
       });
-      isStatic = true;
     };