Skip to content

Commit

Permalink
glm: only override to gcc6 if using gcc by default
Browse files Browse the repository at this point in the history
Otherwise we have a regression on Darwin.
  • Loading branch information
vcunat committed Feb 18, 2018
1 parent a84844d commit e202018
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -8783,9 +8783,9 @@ with pkgs;
glibc32 = pkgsi686Linux.glibc;
};

glm = callPackage ../development/libraries/glm {
stdenv = overrideCC stdenv gcc6; # maybe a hack
};
glm = callPackage ../development/libraries/glm
(lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ });

glm_0954 = callPackage ../development/libraries/glm/0954.nix { };

globalplatform = callPackage ../development/libraries/globalplatform { };
Expand Down

0 comments on commit e202018

Please sign in to comment.