Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

opencollada: switch from `disable-warnings-if-gcc13` to removing `-Werror`

It's a no-op change that consolidates flag changes ina single `.nix`
file. While at it moved `pcre.patch` into `patches` from `postPatch`.

Co-authored-by: Alexis Hildebrandt <afh@surryhill.net>

+6 -2
+5 -1
pkgs/development/libraries/opencollada/default.nix
··· 14 14 }; 15 15 16 16 patches = [ 17 + ./pcre.patch 18 + 17 19 # fix build with gcc 13 18 20 (fetchurl { 19 21 url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b"; ··· 27 29 propagatedBuildInputs = [ libxml2 pcre ]; 28 30 29 31 postPatch = '' 30 - patch -p1 < ${./pcre.patch} 32 + # Drop blanket -Werror as it tends to fail on newer toolchain for 33 + # minor warnings. In this case it was gcc-13 build failure. 34 + substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"' 31 35 '' + lib.optionalString stdenv.isDarwin '' 32 36 substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ 33 37 --replace math.h cmath
+1 -1
pkgs/top-level/all-packages.nix
··· 24052 24052 24053 24053 opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; 24054 24054 24055 - opencollada = disable-warnings-if-gcc13 (callPackage ../development/libraries/opencollada { }); 24055 + opencollada = callPackage ../development/libraries/opencollada { }; 24056 24056 24057 24057 opencore-amr = callPackage ../development/libraries/opencore-amr { }; 24058 24058