diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-23 01:45:35 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-16 23:11:57 +0200 |
| commit | 0255d07f1ae5d8588761dbc038ea5e32e583c67b (patch) | |
| tree | d2b5505d71a326ef55111d2f408df2718a1143b8 | |
| parent | yelp-tools: 3.38.0 → 40.0 (diff) | |
| download | nixpkgs-0255d07f1ae5d8588761dbc038ea5e32e583c67b.tar.gz | |
libblockdev: fix build with glib 2.68
| -rw-r--r-- | pkgs/development/libraries/libblockdev/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 584ea93293ef..9b1654420e74 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; sgdisk = "${gptfdisk}/bin/sgdisk"; }) + + # fix build with glib 2.68 (g_memdup is deprecated) + # https://github.com/storaged-project/libblockdev/pull/623 + (fetchpatch { + url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch"; + sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM="; + }) ]; postPatch = '' |