Merge pull request #139046 from r-burns/nbcompat-take-two

[staging-next] netbsd.compat: fix libs by using cctools strip as objcopy

authored by Luke Granger-Brown and committed by GitHub 759c4c9d 796a5df1

+6 -2
+6 -2
pkgs/os-specific/bsd/netbsd/default.nix
··· 188 188 bsdSetupHook netbsdSetupHook 189 189 makeMinimal 190 190 rsync 191 - ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ 192 - buildPackages.binutils 193 191 ]; 194 192 195 193 buildInputs = with self; commonDeps; ··· 204 202 "TSORT=cat" 205 203 # Can't process man pages yet 206 204 "MKSHARE=no" 205 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 206 + # GNU objcopy produces broken .a libs which won't link into dependers. 207 + # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. 208 + "OBJCOPY=${buildPackages.darwin.cctools}/bin/strip" 207 209 ]; 208 210 RENAME = "-D"; 211 + 212 + passthru.tests = { netbsd-install = self.install; }; 209 213 210 214 patches = [ 211 215 ./compat-cxx-safe-header.patch