mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge #175305: glibc_multi: match output ordering of glibc
In particular this fixes the build of virtualbox again.
This commit is contained in:
commit
b62ada4305
@ -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…
Reference in New Issue
Block a user