diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/gdome2 | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gdome2')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gdome2/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gdome2/default.nix b/nixpkgs/pkgs/development/libraries/gdome2/default.nix index a7dd1f980138..5aa1c487b4f9 100644 --- a/nixpkgs/pkgs/development/libraries/gdome2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdome2/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 gtk-doc ]; propagatedBuildInputs = [glib libxml2]; - patches = [ ./xml-document.patch ]; + patches = [ + ./xml-document.patch + ./fno-common.patch + ]; meta = with lib; { homepage = "http://gdome2.cs.unibo.it/"; diff --git a/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch b/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch new file mode 100644 index 000000000000..f9dc93c48fcf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch @@ -0,0 +1,11 @@ +On gcc-10 -fno-common is the default which forbids miltiple definitions. +--- a/libgdome/xpath/gdome-xpath-xpnsresolv.h ++++ b/libgdome/xpath/gdome-xpath-xpnsresolv.h +@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXPathNSResolver *self, GdomeException *exc + void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc); + GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc); + +-const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; ++extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; + + #endif /* GDOME_XPNSRESOLV_FILE */ |