public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nix: build using gcc8"

Browse Source 
This reverts commit 7ac90533a1afa775e109579788082672a8c35abe.
This commit is contained in:
Eelco Dolstra 2020-01-04 22:35:53 +01:00
parent 3b15451291
commit 0ec8c3bb12
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/package-management/nix/default.nix
View File

@ -2,7 +2,7 @@
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
, aws-sdk-cpp, boehmgc, boost , boehmgc
, stdenv, llvmPackages_6 , stdenv, llvmPackages_6
}: }:
@ -170,7 +170,7 @@ in rec {
# Nix1 has the perl bindings by default, so no need to build the manually. # Nix1 has the perl bindings by default, so no need to build the manually.
includesPerl = true; includesPerl = true;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; inherit storeDir stateDir confDir boehmgc;
}; };
nixStable = callPackage common (rec { nixStable = callPackage common (rec {
@ -180,7 +180,7 @@ in rec {
sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8"; sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8";
}; };
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; inherit storeDir stateDir confDir boehmgc;
} // stdenv.lib.optionalAttrs stdenv.cc.isClang { } // stdenv.lib.optionalAttrs stdenv.cc.isClang {
stdenv = llvmPackages_6.stdenv; stdenv = llvmPackages_6.stdenv;
}); });
@ -196,7 +196,7 @@ in rec {
}; };
fromGit = true; fromGit = true;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; inherit storeDir stateDir confDir boehmgc;
}); });
nixFlakes = lib.lowPrio (callPackage common rec { nixFlakes = lib.lowPrio (callPackage common rec {
@ -210,7 +210,7 @@ in rec {
}; };
fromGit = true; fromGit = true;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; inherit storeDir stateDir confDir boehmgc;
}); });
} }

12
pkgs/top-level/all-packages.nix
View File

@ -24764,18 +24764,6 @@ in
storeDir = config.nix.storeDir or "/nix/store"; storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; }; boehmgc = boehmgc.override { enableLargeConfig = true; };
# Tarball evaluation fails with a gcc9 based nix-env.
# $ nix-build pkgs/top-level/release.nix -A tarball
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
aws-sdk-cpp = aws-sdk-cpp.override {
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
};
boost = boost.override {
buildPackages = buildPackages // {
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
};
stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv;
};
}) })
nix nix
nix1 nix1