From 0ec8c3bb12a97d3b7b29b15bd7ed92be59adc09c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 4 Jan 2020 22:35:53 +0100 Subject: [PATCH] Revert "nix: build using gcc8" This reverts commit 7ac90533a1afa775e109579788082672a8c35abe. --- pkgs/tools/package-management/nix/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 12 ------------ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ba18c8746a6..28413971c00 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,7 +2,7 @@ , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, aws-sdk-cpp, boehmgc, boost +, boehmgc , 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 stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; }; nixStable = callPackage common (rec { @@ -180,7 +180,7 @@ in rec { sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8"; }; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; } // stdenv.lib.optionalAttrs stdenv.cc.isClang { stdenv = llvmPackages_6.stdenv; }); @@ -196,7 +196,7 @@ in rec { }; fromGit = true; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; }); nixFlakes = lib.lowPrio (callPackage common rec { @@ -210,7 +210,7 @@ in rec { }; fromGit = true; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c977dfddfa..7ac4f781ad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24764,18 +24764,6 @@ 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