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

glm: fix gcc 7.3 support

Browse Source 
This will also fix several packages' build
This commit is contained in:
mingchuan 2018-02-24 03:51:07 +08:00
parent a60774c00b
commit f76f4ec7dd
No known key found for this signature in database
GPG Key ID: 607CD25FA2D03651
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/glm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, cmake }: { stdenv, fetchurl, fetchzip, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.8.5"; version = "0.9.8.5";
@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; 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 = '' postPatch = ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}'
cp ${gcc7PlatformPatch} glm/simd/platform.h
''; '';
postInstall = '' postInstall = ''