diff options
author | Robert Hensing <robert@roberthensing.nl> | 2023-02-27 03:53:33 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-28 00:34:00 +0000 |
commit | 359a46e751124454a1a03ad1cdcb1efef745abd8 (patch) | |
tree | c4fe2d0e5faf15ab42ca0c6b0ba1141ea5af52e1 /pkgs/development/compilers/llvm/5 | |
parent | ce07d44ca9d6824125f4a30a96a42555b61de205 (diff) | |
download | nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.tar nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.tar.gz nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.tar.bz2 nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.tar.lz nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.tar.xz nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.tar.zst nixpkgs-359a46e751124454a1a03ad1cdcb1efef745abd8.zip |
llvm*: Remove `outputSpecified` workaround where possible
The effect of `.out // { outputSpecified = false; }` in these cases is to select the default output explicitly, but then make the selection implicit until `overrideAttrs` is called. Previously `overrideAttrs` would not preserve output selection, masking the apparently unnecessary behavior of this workaround. For `libllvm-polly`, this logic does not apply, as it does not select the default output. The `outputSpecified` workaround was introduced in https://github.com/NixOS/nixpkgs/pull/122554 and was perhaps rushed because of a release deadline, and expected delays from mass rebuilds. The change in `overrideAttrs` behavior was added in 5b2f597b116d56104d45c35587920323ed2a5666 / https://github.com/NixOS/nixpkgs/pull/211685 and the problem was discovered in https://github.com/NixOS/nixpkgs/pull/218537, which may contain further information.
Diffstat (limited to 'pkgs/development/compilers/llvm/5')
-rw-r--r-- | pkgs/development/compilers/llvm/5/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 3cfc89dac75..d446608d353 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -41,7 +41,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -54,7 +54,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; |