summary refs log tree commit diff
path: root/pkgs/os-specific/bsd
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-05-31 19:44:15 +0000
committerGitHub <noreply@github.com>2021-05-31 19:44:15 +0000
commitabef57f931f535fc4dc32bcc6bcc619c3329bfe0 (patch)
tree61df77e53b852826f3effe9e9b519ac1604882c5 /pkgs/os-specific/bsd
parent3e6f510ca2b80a3c1563e5a80225bb81efde8ed5 (diff)
parent7f146768734b93c41fc5c8d8c0a757ec78e0e35c (diff)
downloadnixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.tar
nixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.tar.gz
nixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.tar.bz2
nixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.tar.lz
nixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.tar.xz
nixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.tar.zst
nixpkgs-abef57f931f535fc4dc32bcc6bcc619c3329bfe0.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/bsd')
-rw-r--r--pkgs/os-specific/bsd/netbsd/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 63e52a3bf3c..1d5e210f8ac 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -753,11 +753,11 @@ in lib.makeScopeWithSplicing
     version = "9.2";
     sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa";
     meta.platforms = lib.platforms.netbsd;
-    LIBC_PIC = "${stdenv.cc.libc}/lib/libc_pic.a";
+    LIBC_PIC = "${self.libc}/lib/libc_pic.a";
     # Hack to prevent a symlink being installed here for compatibility.
     SHLINKINSTALLDIR = "/usr/libexec";
     USE_FORT = "yes";
-    makeFlags = [ "CLIBOBJ=${stdenv.cc.libc}/lib" ];
+    makeFlags = [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ];
     extraPaths = with self; [ libc.src ] ++ libc.extraPaths;
   };