diff options
| author | mingchuan <ming@culpring.com> | 2018-02-24 03:51:07 +0800 |
|---|---|---|
| committer | mingchuan <ming@culpring.com> | 2018-02-25 14:08:42 +0800 |
| commit | f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a (patch) | |
| tree | 9073345198e99c9d09da3afc5ec5217dc2dbda89 /pkgs/development/libraries/glm | |
| parent | a60774c00b9936bebb977698493214790d1b2bdb (diff) | |
| download | nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.tar nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.tar.gz nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.tar.bz2 nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.tar.lz nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.tar.xz nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.tar.zst nixpkgs-f76f4ec7dd0fd7a3a92bf9087217b7f4fb4e710a.zip | |
glm: fix gcc 7.3 support
This will also fix several packages' build
Diffstat (limited to 'pkgs/development/libraries/glm')
| -rw-r--r-- | pkgs/development/libraries/glm/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 904727ceae6..803f08a7a11 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake }: +{ stdenv, fetchurl, fetchzip, cmake }: stdenv.mkDerivation rec { version = "0.9.8.5"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; + # fetch newer version of platform.h which correctly supports gcc 7.3 + gcc7PlatformPatch = fetchurl { + url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h"; + sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw"; + }; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' + cp ${gcc7PlatformPatch} glm/simd/platform.h ''; postInstall = '' |