public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more build fixups concerning automake defaults

Browse Source
This commit is contained in:
Vladimír Čunát 2015-03-04 22:01:11 +01:00
parent 91fa9b27d5
commit 856d1ff27f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/gnupg/21.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth
, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null
, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext , zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, texinfo, gettext
}: }:
with stdenv.lib; with stdenv.lib;
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig libgcrypt libassuan libksba npth pkgconfig libgcrypt libassuan libksba npth
readline libusb gnutls adns openldap zlib bzip2 readline libusb gnutls adns openldap zlib bzip2
autoreconfHook gettext autoreconfHook texinfo gettext
]; ];
configureFlags = configureFlags =

17
pkgs/top-level/all-packages.nix
View File

@ -1469,6 +1469,7 @@ let
grub = callPackage_i686 ../tools/misc/grub { grub = callPackage_i686 ../tools/misc/grub {
buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
automake = automake112x; # fails with 13 and 14
}; };
trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix {
@ -2212,7 +2213,9 @@ let
panomatic = callPackage ../tools/graphics/panomatic { }; panomatic = callPackage ../tools/graphics/panomatic { };
par2cmdline = callPackage ../tools/networking/par2cmdline { }; par2cmdline = callPackage ../tools/networking/par2cmdline {
automake = automake112x; # fails with 14
};
parallel = callPackage ../tools/misc/parallel { }; parallel = callPackage ../tools/misc/parallel { };
@ -2333,7 +2336,9 @@ let
ponysay = callPackage ../tools/misc/ponysay { }; ponysay = callPackage ../tools/misc/ponysay { };
povray = callPackage ../tools/graphics/povray { }; povray = callPackage ../tools/graphics/povray {
automake = automake113x; # fails with 14
};
ppl = callPackage ../development/libraries/ppl { }; ppl = callPackage ../development/libraries/ppl { };
@ -6037,7 +6042,9 @@ let
libassuan = callPackage ../development/libraries/libassuan { }; libassuan = callPackage ../development/libraries/libassuan { };
libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix {
automake = automake112x; # fails with 13 and 14
};
libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
@ -6632,7 +6639,9 @@ let
libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; libunwindNative = callPackage ../development/libraries/libunwind/native.nix {};
libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { }); libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
automake = automake113x; # fails with 14
});
libv4l = lowPrio (v4l_utils.override { libv4l = lowPrio (v4l_utils.override {
withQt4 = false; withQt4 = false;