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

Merge pull request #265363 from wegank/glm-clang

Browse Source 
glm: fix build with clang
This commit is contained in:
Weijia Wang
2023-11-04 17:45:44 +01:00
committed by GitHub
parent 5320fd8852 d8addbc428
commit 6ee671001c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glm/default.nix
+8 -6
View File
@@ -16,13 +16,15 @@ 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=";
})];
# (https://github.com/g-truc/glm/pull/1055 neither)
patches = [
(fetchpatch {
name = "glm-0.9.9.8-clang.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glm/files/glm-0.9.9.8-clang.patch?id=79476d4b145a4a6b0cbc0e73a6cefb5d584bf8fa";
hash = "sha256-D8O+qofnGUEaH5nQGdNddwHyr5FhPQa/lOup4z4SFgY=";
})
];
outputs = [ "out" "doc" ];