From 59eca689ccc58861fb0937bcafcf6299d7cd4acb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Jun 2018 20:34:59 -0500 Subject: dmraid: fix w/musl (missing includes, -D_GNU_SOURCE) --- pkgs/os-specific/linux/dmraid/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/dmraid') diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index d39cadf4199..73ae6801bc2 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, fetchpatch, devicemapper }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; @@ -8,10 +8,20 @@ stdenv.mkDerivation rec { sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; - patches = [ ./hardening-format.patch ]; + patches = [ ./hardening-format.patch ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch"; + sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w"; + stripLen = 2; + extraPrefix = "1.0.0.rc16/"; + }) + ]; postPatch = '' sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE" ''; preConfigure = "cd */"; -- cgit 1.4.1