Merge master into staging-next

2021-02-07 18:16:08 +00:00
parent be6e431001 de88795283
commit 2226996f6c
48 changed files with 721 additions and 663 deletions
@@ -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;

@@ -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