diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2021-11-22 11:14:58 +0100 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-22 23:02:27 -0800 |
| commit | 67c9d4ae0086730668661af469886dfc99f1392e (patch) | |
| tree | af0cea52340c322a39985fb974f3cb305c01f463 | |
| parent | ebbca75dc2b74d6b68f9a157ac2ec643a7570d19 (diff) | |
| download | nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.tar nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.tar.gz nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.tar.bz2 nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.tar.lz nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.tar.xz nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.tar.zst nixpkgs-67c9d4ae0086730668661af469886dfc99f1392e.zip | |
glm: fix aarch64-darwin build by fixing cmake warnings
| -rw-r--r-- | pkgs/development/libraries/glm/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index ef8cd49ba29..81b0b47d5ba 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: stdenv.mkDerivation rec { version = "0.9.9.8"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; + # https://github.com/g-truc/glm/pull/1055 + # Fix more implicit-int-float-conversion warnings + # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) + patches = [(fetchpatch { + url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; + sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; + })]; + outputs = [ "out" "doc" ]; nativeBuildInputs = [ cmake ]; |