diff options
| author | Artturin <Artturin@artturin.com> | 2022-05-29 19:25:54 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-05-29 21:00:45 +0300 |
| commit | 7797c7ece5f7636ea506e08f50642d7b18fd45eb (patch) | |
| tree | 9d5b843e0dff2259aa5e83fb02081a4755aeaf0b | |
| parent | treewide: change some glibc to stdenv.cc.libc (diff) | |
| download | nixpkgs-7797c7ece5f7636ea506e08f50642d7b18fd45eb.tar.gz | |
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
(cherry picked from commit 513b7f1010e737dcac47645c8af3d7483ddc29d4)
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/multi.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 91c3d55926a3..4b58da1539d5 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.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 ]; diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index 5d3626b95cc0..be190d77c736 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -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" |