From c6d26b7f72247bd4d7f0d738dbf48cb605567e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Feb 2018 16:12:51 +0100 Subject: [PATCH] glm: "build" with gcc6 again It seems to be a hack, as the compiler apparently doesn't influence the output and it's only used for some checks. Still, LibreOffice seems to run OK with this... --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8bdd677957..53b673a6a62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8777,7 +8777,9 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm { }; + glm = callPackage ../development/libraries/glm { + stdenv = overrideCC stdenv gcc6; # maybe a hack + }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; globalplatform = callPackage ../development/libraries/globalplatform { };