From 3ecad270323a6f05879be9786579da6dd4ed91c3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 2 May 2018 13:24:27 -0500 Subject: [PATCH] ltrace: fix warnings and bugs using patches from debian For details on the patches applied, see: https://sources.debian.org/patches/ltrace/0.7.3-6/ Disabling '-Werror' may be a problem in the future again, but for now keep things simple now that they're fixed. --- pkgs/development/tools/misc/ltrace/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 66fbed514dc..15eac37a53a 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -10,10 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ elfutils libunwind ]; - preConfigure = - '' - configureFlags="--disable-werror" - makeFlagsArray=(INSTALL="install -c") + prePatch = let + debian = fetchurl { + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz; + sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp"; + }; + in '' + tar xf '${debian}' + patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; meta = with stdenv.lib; {