Merge #175305: glibc_multi: match output ordering of glibc

In particular this fixes the build of virtualbox again.
This commit is contained in:
Vladimír Čunát 2022-05-29 19:23:23 +02:00
commit b62ada4305
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 1 deletions

View File

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

View File

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