Merge #98541 into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-14 09:19:31 +01:00
27 changed files with 668 additions and 272 deletions

View File

@@ -16,8 +16,10 @@ python3Packages.buildPythonApplication rec {
(substituteAll {
src = ./nix-paths.patch;
df = "${coreutils}/bin/df";
libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";
in "${stdenv.cc.libc}/lib/libc${ext}";
libc =
if stdenv.hostPlatform.isDarwin
then "/usr/lib/libSystem.dylib"
else "${stdenv.cc.libc}/lib/libc.so.6";
})
];