diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-07 18:16:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 18:16:08 +0000 |
| commit | 2226996f6ca0ca2e0d429633494a148dd5772560 (patch) | |
| tree | 8b9ac65f1c435adde89b950c3c0cf52e88248ce3 /pkgs/build-support | |
| parent | be6e4310017ae725f73a0b94c3c0b3e55434325d (diff) | |
| parent | de88795283c8459e77ed401b984900d54235795b (diff) | |
| download | nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.tar nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.tar.gz nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.tar.bz2 nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.tar.lz nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.tar.xz nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.tar.zst nixpkgs-2226996f6ca0ca2e0d429633494a148dd5772560.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/release/debian-build.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 48a3ebb32df..8fef2ca6624 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -64,6 +64,7 @@ let else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 2544d5c740c..4c2d82ce630 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -2,7 +2,6 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" -, lib , diskImage , src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false |