public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59278 from veprbl/pr/netbsd_darwin_fix

Browse Source 
netbsd.mkDerivation: fix darwin build
This commit is contained in:
Matthew Bauer 2019-04-10 20:39:58 -04:00 committed by GitHub
commit 51be4c6f32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -51,7 +51,7 @@ let
AR = "${stdenv'.cc.targetPrefix or ""}ar"; AR = "${stdenv'.cc.targetPrefix or ""}ar";
CC = "${stdenv'.cc.targetPrefix or ""}cc"; 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++"; CXX = "${stdenv'.cc.targetPrefix or ""}c++";
LD = "${stdenv'.cc.targetPrefix or ""}ld"; LD = "${stdenv'.cc.targetPrefix or ""}ld";
STRIP = "${stdenv'.cc.targetPrefix or ""}strip"; STRIP = "${stdenv'.cc.targetPrefix or ""}strip";
@ -65,6 +65,8 @@ let
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.bsd2; license = licenses.bsd2;
}; };
} // lib.optionalAttrs stdenv'.isDarwin {
MKRELRO = "no";
} // lib.optionalAttrs (stdenv'.cc.isClang or false) { } // lib.optionalAttrs (stdenv'.cc.isClang or false) {
HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
} // lib.optionalAttrs (stdenv'.cc.isGNU or false) { } // lib.optionalAttrs (stdenv'.cc.isGNU or false) {