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

xqilla: fix build with gcc 11+

Browse Source
This commit is contained in:
Weijia Wang 2023-12-10 23:39:15 +01:00
parent 64891e361b
commit dd5012e166
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/xqilla/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, xercesc }:
{ lib, stdenv, fetchurl, fetchpatch, xercesc }:
stdenv.mkDerivation rec {
pname = "xqilla";
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd";
};
patches = [
(fetchpatch {
name = "xqilla-gcc11.patch";
url = "https://git.pld-linux.org/gitweb.cgi?p=packages/xqilla.git;a=blob_plain;f=xqilla-gcc11.patch;h=c9e28be64097040348f710cb27be5f7dad001112;hb=4efe07397c6fb426a65b2eec6999d3c7e683848a";
hash = "sha256-enMEF3U+PsbwOQ5SwlRVWc/FpyLS3aK6JgUgOp3ZbiA=";
})
];
configureFlags = [ "--with-xerces=${xercesc}" ];
meta = with lib; {

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

@ -27528,7 +27528,7 @@ with pkgs;
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; };
xqilla = callPackage ../development/tools/xqilla { };
xquartz = callPackage ../servers/x11/xquartz { };