diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 08:21:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 08:21:54 +0200 |
| commit | a12aeebedbac1bbb02d1beec35925c433cf022f5 (patch) | |
| tree | 6e552607f0193d0d1fb91d6cd2e2037de5e6462d /pkgs/development/tools | |
| parent | fbf4028074d449d159297400730d67838fcbf5b8 (diff) | |
| parent | 5e32d10aeb74836da322905a0d18839dc3d439e3 (diff) | |
| download | nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.gz nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.bz2 nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.lz nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.xz nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.tar.zst nixpkgs-a12aeebedbac1bbb02d1beec35925c433cf022f5.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/scons/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/libtool/libtool2.nix | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index ce15de8678d..08644def517 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.5"; - sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; + version = "3.1.0"; + sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0fb3dfed744..0424b901251 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -2,10 +2,11 @@ }: stdenv.mkDerivation rec { - name = "libtool-2.4.6"; + pname = "libtool"; + version = "2.4.6"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/libtool/${pname}-${version}.tar.gz"; sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; @@ -23,13 +24,14 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = false; + enableParallelBuilding = true; + # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = { + meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; - longDescription = '' GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, @@ -39,12 +41,9 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; - - license = stdenv.lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } |