···98 # Disable check phase as there are failures (4 tests fail)
99 doCheck = false;
100101+ doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf;
0102 installCheckPhase = ''
103 runHook preInstallCheck
104 readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so'
+1-2
pkgs/development/libraries/boost/generic.nix
···73 else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"
74 else toString stdenv.hostPlatform.parsed.cpu.family}"
75 # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o"
76- "binary-format=${if stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.macho
77- then "mach-o"
78 else toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
79 "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}"
80
···73 else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"
74 else toString stdenv.hostPlatform.parsed.cpu.family}"
75 # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o"
76+ "binary-format=${if stdenv.hostPlatform.isMacho then "mach-o"
077 else toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
78 "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}"
79
···93 else if stdenv.hostPlatform.isBSD
94 then if stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64"
95 else if stdenv.hostPlatform.isx86_32
96- then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf"
97 else "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
98 else if stdenv.hostPlatform.isMinGW
99 then "./Configure mingw${lib.optionalString
···93 else if stdenv.hostPlatform.isBSD
94 then if stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64"
95 else if stdenv.hostPlatform.isx86_32
96+ then "./Configure BSD-x86" + lib.optionalString stdenv.hostPlatform.isElf "-elf"
97 else "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
98 else if stdenv.hostPlatform.isMinGW
99 then "./Configure mingw${lib.optionalString
+1-1
pkgs/development/libraries/quictls/default.nix
···90 else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64
91 then "./Configure BSD-x86_64"
92 else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32
93- then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf"
94 else if stdenv.hostPlatform.isBSD
95 then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
96 else if stdenv.hostPlatform.isMinGW
···90 else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64
91 then "./Configure BSD-x86_64"
92 else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32
93+ then "./Configure BSD-x86" + lib.optionalString stdenv.hostPlatform.isElf "-elf"
94 else if stdenv.hostPlatform.isBSD
95 then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
96 else if stdenv.hostPlatform.isMinGW
···109 # there (yet?) so it goes here until then.
110 preHook = preHook + lib.optionalString buildPlatform.isDarwin ''
111 export NIX_DONT_SET_RPATH_FOR_BUILD=1
112- '' + lib.optionalString (hostPlatform.isDarwin || (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho)) ''
113 export NIX_DONT_SET_RPATH=1
114 export NIX_NO_SELF_RPATH=1
115 '' + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
···109 # there (yet?) so it goes here until then.
110 preHook = preHook + lib.optionalString buildPlatform.isDarwin ''
111 export NIX_DONT_SET_RPATH_FOR_BUILD=1
112+ '' + lib.optionalString (hostPlatform.isDarwin || (!hostPlatform.isElf && !hostPlatform.isMacho)) ''
113 export NIX_DONT_SET_RPATH=1
114 export NIX_NO_SELF_RPATH=1
115 '' + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
+1-4
pkgs/top-level/all-packages.nix
···21575 mtrace = callPackage ../development/libraries/glibc/mtrace.nix { };
2157621577 # Provided by libc on Operating Systems that use the Extensible Linker Format.
21578- elf-header =
21579- if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf"
21580- then null
21581- else elf-header-real;
2158221583 elf-header-real = callPackage ../development/libraries/elf-header { };
21584
···21575 mtrace = callPackage ../development/libraries/glibc/mtrace.nix { };
2157621577 # Provided by libc on Operating Systems that use the Extensible Linker Format.
21578+ elf-header = if stdenv.hostPlatform.isElf then null else elf-header-real;
0002157921580 elf-header-real = callPackage ../development/libraries/elf-header { };
21581