diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-31 19:44:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 19:44:13 +0000 |
| commit | 7f146768734b93c41fc5c8d8c0a757ec78e0e35c (patch) | |
| tree | 0dfd5ea6bf33d34fcf0715812c26c9532f53301f /pkgs/os-specific/bsd/netbsd/default.nix | |
| parent | 5bf27cf89e9aedd0527538f8343b59240413087f (diff) | |
| parent | 311dfcbc469b48c137915fc252b2e54690b52fd2 (diff) | |
| download | nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.tar nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.tar.gz nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.tar.bz2 nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.tar.lz nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.tar.xz nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.tar.zst nixpkgs-7f146768734b93c41fc5c8d8c0a757ec78e0e35c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/bsd/netbsd/default.nix')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 4 |
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 7aad67e777e..9e0b734c817 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.1"; 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; }; |