diff options
| author | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2018-03-14 18:06:21 +0000 |
|---|---|---|
| committer | Josef Kemetmüller <josef.kemetmueller@gmail.com> | 2018-03-14 18:06:21 +0000 |
| commit | 863fb7b86ad9992bd098bb64655af6f6f01ed144 (patch) | |
| tree | be32f8400a449ceeb20239f4dac096c98c35027e /pkgs/development/libraries/glm/default.nix | |
| parent | ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554 (diff) | |
| download | nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.tar nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.tar.gz nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.tar.bz2 nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.tar.lz nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.tar.xz nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.tar.zst nixpkgs-863fb7b86ad9992bd098bb64655af6f6f01ed144.zip | |
glm: fix darwin build
Diffstat (limited to 'pkgs/development/libraries/glm/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glm/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 803f08a7a11..319a0359c58 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { # 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"; + url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h"; + sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia"; }; postPatch = '' @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp ${gcc7PlatformPatch} glm/simd/platform.h ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ + "-DGLM_COMPILER=0" + ]; + postInstall = '' mkdir -p $doc/share/doc/glm cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm |