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

libblockdev: fix build with glib 2.68

Browse Source
This commit is contained in:
Jan Tojnar 2021-03-23 01:45:35 +01:00
parent 103625a915
commit 3a669c7106
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libblockdev/default.nix
View File

@ -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 , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch; src = ./fix-paths.patch;
sgdisk = "${gptfdisk}/bin/sgdisk"; 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 = '' postPatch = ''