glibc_multi: match output ordering of glibc

glibc has an exception in that 'out' is the default output instead of 'bin'

it should be matched here for consistency
main
Artturin 2 years ago
parent 5908b6d222
commit 513b7f1010
  1. 1
      pkgs/development/libraries/glibc/common.nix
  2. 3
      pkgs/development/libraries/glibc/multi.nix

@ -201,6 +201,7 @@ stdenv.mkDerivation ({
installFlags = [ "sysconfdir=$(out)/etc" ];
# out as the first output is an exception exclusive to glibc
outputs = [ "out" "bin" "dev" "static" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];

@ -6,7 +6,8 @@ let
glibc64 = glibc;
in
runCommand "${nameVersion.name}-multi-${nameVersion.version}"
{ outputs = [ "bin" "dev" "out"]; } # TODO: no static version here (yet)
# out as the first output is an exception exclusive to glibc
{ outputs = [ "out" "bin" "dev" ]; } # TODO: no static version here (yet)
''
mkdir -p "$out/lib"
ln -s '${glibc64.out}'/lib/* "$out/lib"

Loading…
Cancel
Save