dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #292433 from trofi/opencollada-cleanup

Browse Source 
opencollada: switch from `disable-warnings-if-gcc13` to removing `-We…
This commit is contained in:
Mario Rodas 2024-03-03 08:45:22 -05:00 committed by GitHub
commit 15226a681d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/opencollada/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
};
patches = [
./pcre.patch
# fix build with gcc 13
(fetchurl {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b";
@ -27,7 +29,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libxml2 pcre ];
postPatch = ''
patch -p1 < ${./pcre.patch}
# Drop blanket -Werror as it tends to fail on newer toolchain for
# minor warnings. In this case it was gcc-13 build failure.
substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"'
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
--replace math.h cmath

2
pkgs/top-level/all-packages.nix
View File

@ -24022,7 +24022,7 @@ with pkgs;
opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };
opencollada = disable-warnings-if-gcc13 (callPackage ../development/libraries/opencollada { });
opencollada = callPackage ../development/libraries/opencollada { };
opencore-amr = callPackage ../development/libraries/opencore-amr { };