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

Merge pull request #76890 from LnL7/nix-gcc-8 

nix: build using gcc8
This commit is contained in:
Graham Christensen 2020-01-03 11:40:57 -05:00 committed by GitHub
parent af2046d3f1 7ac90533a1
commit e0470e11c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 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"
, stateDir ? "/nix/var"
, confDir ? "/etc"
, boehmgc
, aws-sdk-cpp, boehmgc, boost
, stdenv, llvmPackages_6
}:
@ -170,7 +170,7 @@ in rec {
# Nix1 has the perl bindings by default, so no need to build the manually.
includesPerl = true;
inherit storeDir stateDir confDir boehmgc;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
};
nixStable = callPackage common (rec {
@ -180,7 +180,7 @@ in rec {
sha256 = "bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b";
};
inherit storeDir stateDir confDir boehmgc;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
} // stdenv.lib.optionalAttrs stdenv.cc.isClang {
stdenv = llvmPackages_6.stdenv;
});
@ -196,7 +196,7 @@ in rec {
};
fromGit = true;
inherit storeDir stateDir confDir boehmgc;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
});
nixFlakes = lib.lowPrio (callPackage common rec {
@ -210,7 +210,7 @@ in rec {
};
fromGit = true;
inherit storeDir stateDir confDir boehmgc;
inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost;
});
}

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

@ -24764,6 +24764,18 @@ in
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
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
nix1