diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-14 22:46:09 +0200 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-30 19:39:48 +0200 |
| commit | 36a95c772ac56ef4fae4dc8d116d77a081e1b021 (patch) | |
| tree | 340b76ac1ebc2c34e51902fb8fac92b618d2a4cc | |
| parent | 0b45e79490c2874fee18875acf490a5401325a8a (diff) | |
| download | nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.tar nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.tar.gz nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.tar.bz2 nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.tar.lz nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.tar.xz nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.tar.zst nixpkgs-36a95c772ac56ef4fae4dc8d116d77a081e1b021.zip | |
ldmtool: fix build with glib-2.62
| -rw-r--r-- | pkgs/tools/misc/ldmtool/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index b59c46a8477..d1d3996bd62 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/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"; |