diff options
author | Will Dietz <github@wdtz.org> | 2018-05-02 14:04:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 14:04:02 -0500 |
commit | 519d19bf72d6df0618866dbe8776217dd094f194 (patch) | |
tree | 88a92e6f602db7871de1b01196713bdf891b1acf /pkgs/development/tools | |
parent | 1eea1d6bdf8925d1d75850e835e3d89f0afc543f (diff) | |
parent | 3ecad270323a6f05879be9786579da6dd4ed91c3 (diff) | |
download | nixlib-519d19bf72d6df0618866dbe8776217dd094f194.tar nixlib-519d19bf72d6df0618866dbe8776217dd094f194.tar.gz nixlib-519d19bf72d6df0618866dbe8776217dd094f194.tar.bz2 nixlib-519d19bf72d6df0618866dbe8776217dd094f194.tar.lz nixlib-519d19bf72d6df0618866dbe8776217dd094f194.tar.xz nixlib-519d19bf72d6df0618866dbe8776217dd094f194.tar.zst nixlib-519d19bf72d6df0618866dbe8776217dd094f194.zip |
Merge pull request #39877 from dtzWill/fix/ltrace-debian-patches
ltrace: fix warnings and bugs using patches from debian
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/misc/ltrace/default.nix | 12 |
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 66fbed514dc5..15eac37a53a9 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; { |