Merge pull request #59278 from veprbl/pr/netbsd_darwin_fix

netbsd.mkDerivation: fix darwin build
NixOS · Apr 11, 2019 · 51be4c6 · 51be4c6
2 parents bd50fc9 + 81ab32e
commit 51be4c6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -51,7 +51,7 @@ let
 
     AR = "${stdenv'.cc.targetPrefix or ""}ar";
     CC = "${stdenv'.cc.targetPrefix or ""}cc";
-    CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp";
+    CPP = "${stdenv'.cc.targetPrefix or ""}cpp";
     CXX = "${stdenv'.cc.targetPrefix or ""}c++";
     LD = "${stdenv'.cc.targetPrefix or ""}ld";
     STRIP = "${stdenv'.cc.targetPrefix or ""}strip";
@@ -65,6 +65,8 @@ let
       platforms = platforms.unix;
       license = licenses.bsd2;
     };
+  } // lib.optionalAttrs stdenv'.isDarwin {
+    MKRELRO = "no";
   } // lib.optionalAttrs (stdenv'.cc.isClang or false) {
     HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
   } // lib.optionalAttrs (stdenv'.cc.isGNU or false) {