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

Revert "glm: "build" with gcc6 again"

Browse Source 
This reverts commit c6d26b7f72247bd4d7f0d738dbf48cb605567e0b.
The hack isn't needed anymore.  No change in output compared to
the parent commit (except for hashes).
This commit is contained in:
Vladimír Čunát 2018-02-27 00:04:39 +01:00
parent f76f4ec7dd
commit fd6930f404
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8870,9 +8870,7 @@ with pkgs;
glibc32 = pkgsi686Linux.glibc; glibc32 = pkgsi686Linux.glibc;
}; };
glm = callPackage ../development/libraries/glm 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 { }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { };
globalplatform = callPackage ../development/libraries/globalplatform { }; globalplatform = callPackage ../development/libraries/globalplatform { };