diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
| commit | 0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (patch) | |
| tree | bd701e982d896952f4291e4b795c85bb581593b8 /nixpkgs/pkgs/tools/misc/ldmtool/default.nix | |
| parent | dae1ae41b3a575e87d411e0cd9daa42a85c5aa89 (diff) | |
| parent | 1c40ee6fc44f7eb474c69ea070a43247a1a2c83c (diff) | |
Merge commit '1c40ee6fc44f7eb474c69ea070a43247a1a2c83c'
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/ldmtool/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/ldmtool/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/tools/misc/ldmtool/default.nix b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix index b59c46a8477..d1d3996bd62 100644 --- a/nixpkgs/pkgs/tools/misc/ldmtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, - libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }: + libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl +, fetchpatch }: stdenv.mkDerivation rec { pname = "ldmtool"; @@ -12,13 +13,21 @@ stdenv.mkDerivation rec { sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; }; + patches = [ + # Remove useage of deprecrated G_PARAM_PRIVATE + (fetchpatch { + url = "https://github.com/mdbooth/libldm/commit/ee1b37a034038f09d61b121cc8b3651024acc46f.patch"; + sha256 = "02y34kbcpcpffvy1n9yqngvdldmxmvdkha1v2xjqvrnclanpigcp"; + }) + ]; + preConfigure = '' sed -i docs/reference/ldmtool/Makefile.am \ -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g' ''; - # ldm.c:951:5: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations] - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; configureScript = "sh autogen.sh"; |