From fd6930f404601ed47c9aa95374328d0dbfd46caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 Feb 2018 00:04:39 +0100 Subject: [PATCH] Revert "glm: "build" with gcc6 again" This reverts commit c6d26b7f72247bd4d7f0d738dbf48cb605567e0b. The hack isn't needed anymore. No change in output compared to the parent commit (except for hashes). --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdc888fba438..76bd15fe5676 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8870,9 +8870,7 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm - (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ }); - + glm = callPackage ../development/libraries/glm { }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; globalplatform = callPackage ../development/libraries/globalplatform { };