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

glm: only override to gcc6 if using gcc by default

Browse Source 
Otherwise we have a regression on Darwin.
This commit is contained in:
Vladimír Čunát 2018-02-18 10:13:05 +01:00
parent a84844de03
commit e202018d1f
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8783,9 +8783,9 @@ with pkgs;
glibc32 = pkgsi686Linux.glibc; glibc32 = pkgsi686Linux.glibc;
}; };
glm = callPackage ../development/libraries/glm { glm = callPackage ../development/libraries/glm
stdenv = overrideCC stdenv gcc6; # maybe a hack (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ });
};
glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { };
globalplatform = callPackage ../development/libraries/globalplatform { }; globalplatform = callPackage ../development/libraries/globalplatform { };