fix(3p): Force all stdenvs to use LLVM10

This commit is contained in:
Vincent Ambo 2020-05-31 21:58:17 +01:00
parent 48f08e8cc0
commit 76f4e27386

View file

@ -30,10 +30,12 @@ let
inherit (nixpkgs) inherit (nixpkgs)
age age
autoconf autoconf
autoreconfHook
bashInteractive bashInteractive
bat bat
buildGoModule buildGoModule
buildGoPackage buildGoPackage
buildPackages
bzip2 bzip2
c-ares c-ares
cacert cacert
@ -42,7 +44,6 @@ let
cargo cargo
cgit cgit
clang-tools clang-tools
clangStdenv
clang_10 clang_10
cmake cmake
coreutils coreutils
@ -59,6 +60,7 @@ let
freetype freetype
gettext gettext
glibc glibc
gmock
gnutar gnutar
go go
google-cloud-sdk google-cloud-sdk
@ -92,7 +94,6 @@ let
parallel parallel
pkgconfig pkgconfig
pounce pounce
protobuf
python3 python3
python3Packages python3Packages
remarshal remarshal
@ -105,7 +106,6 @@ let
rustc rustc
sbcl sbcl
sqlite sqlite
stdenv
stern stern
symlinkJoin symlinkJoin
systemd systemd
@ -153,8 +153,8 @@ let
utillinuxMinimal; utillinuxMinimal;
}; };
in exposed // { in exposed.lib.fix(self: exposed // {
callPackage = nixpkgs.lib.callPackageWith exposed; callPackage = nixpkgs.lib.callPackageWith self;
# Provide the source code of nixpkgs, but do not provide an imported # Provide the source code of nixpkgs, but do not provide an imported
# version of it. # version of it.
@ -169,7 +169,9 @@ in exposed // {
# Use LLVM 10 # Use LLVM 10
llvmPackages = nixpkgs.llvmPackages_10; llvmPackages = nixpkgs.llvmPackages_10;
clangStdenv = nixpkgs.llvmPackages_10.stdenv;
stdenv = nixpkgs.llvmPackages_10.stdenv;
# Make NixOS available # Make NixOS available
nixos = import "${stableNixpkgsSrc}/nixos"; nixos = import "${stableNixpkgsSrc}/nixos";
} })