Skip to content

Commit 3fd44d9

Browse files
committed
libblockdev: don't bother with dmraid, fix w/musl
Upstream[1] suggests this is a dmraid problem and that if building libblockdev only for udisks2 (AFAICT this is the case) there's no need for dmraid anyway. [1] storaged-project/libblockdev#331
1 parent bc25b46 commit 3fd44d9

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

pkgs/development/libraries/libblockdev/default.nix

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
1+
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
22
, python3, gobjectIntrospection, glib, libudev, kmod, parted, cryptsetup
33
, devicemapper, dmraid, utillinux, libbytesize, nss, volume_key
44
}:
@@ -18,6 +18,13 @@ in stdenv.mkDerivation rec {
1818
outputs = [ "out" "dev" "devdoc" ];
1919
outputBin = "dev";
2020

21+
patches = [
22+
(fetchpatch {
23+
url = "https://github.com/storaged-project/libblockdev/commit/18fac90f3008fe046689d469629e7d84ccbd1e24.patch";
24+
sha256 = "0b745ap0pl3yrd0g9bq9jmc2j573d5pnp0wpw5yiac5589sabwmh";
25+
})
26+
];
27+
2128
postPatch = ''
2229
patchShebangs scripts
2330
'';
@@ -30,6 +37,9 @@ in stdenv.mkDerivation rec {
3037
glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize nss volume_key
3138
];
3239

40+
# https://github.com/storaged-project/libblockdev/issues/331
41+
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--without-dm";
42+
3343
meta = with stdenv.lib; {
3444
description = "A library for manipulating block devices";
3545
homepage = http://storaged.org/libblockdev/;

0 commit comments

Comments
 (0)