diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-27 00:05:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-27 00:05:33 +0100 |
| commit | 8be317ab83095d441afe8e74057b193f7b14cd8d (patch) | |
| tree | 5c63183bef1702ac224dae4f90e18d121487f3c4 | |
| parent | 23966c201d59081a77aefd0a1fd64511f79dacfd (diff) | |
| parent | fd6930f404601ed47c9aa95374328d0dbfd46caf (diff) | |
| download | nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.tar nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.tar.gz nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.tar.bz2 nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.tar.lz nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.tar.xz nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.tar.zst nixpkgs-8be317ab83095d441afe8e74057b193f7b14cd8d.zip | |
Merge #35420: glm: fix gcc 7 support
| -rw-r--r-- | pkgs/development/libraries/glm/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 4 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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c3ac92d4b5..adb69dab7b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8887,9 +8887,7 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm - (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ }); - + glm = callPackage ../development/libraries/glm { }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; globalplatform = callPackage ../development/libraries/globalplatform { }; |