diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-08 10:22:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-08 10:22:31 +0100 |
| commit | cdde22aef5c126e4474f3ecb67c32507db5a3138 (patch) | |
| tree | 6fd31f9ce404bacfd7f1f06e52e4567af7c08509 /pkgs/development/tools | |
| parent | 86ffdce8788757ef4fedcf726c73a80beba04b7d (diff) | |
| parent | 9ab584833534cfb94e148b2c88ba932ead00bcdb (diff) | |
| download | nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.gz nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.bz2 nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.lz nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.xz nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.zst nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.zip | |
Merge branch 'staging' (older one)
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/help2man/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/libtool/default.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index ada2dd1a89a1..6e341b577cfb 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.4"; + name = "help2man-1.47.5"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; + sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; }; nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 88a33bb5dccb..23cc2c87a513 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { name = "libtool-1.5.26"; - + src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w"; }; - - buildInputs = [m4 perl]; + + nativeBuildInputs = [m4]; + buildInputs = [perl]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! |