summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-05-02 13:24:27 -0500
committerWill Dietz <w@wdtz.org>2018-05-02 13:28:11 -0500
commit3ecad270323a6f05879be9786579da6dd4ed91c3 (patch)
treee34c884236420301b57f949ff93b1f744d42ca5d /pkgs
parent42d3b536c65176ad97d0c3047f563823b2235201 (diff)
downloadnixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.tar
nixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.tar.gz
nixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.tar.bz2
nixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.tar.lz
nixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.tar.xz
nixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.tar.zst
nixpkgs-3ecad270323a6f05879be9786579da6dd4ed91c3.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/ltrace/default.nix12
1 files 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; {