diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-09 13:05:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-10 13:42:44 -0700 |
| commit | 91da60610175beebd78132591d39b49897aa380d (patch) | |
| tree | 7d1645d6624e3556b07658822372d2b70e58d420 /pkgs/development | |
| parent | 1f45b59885c503fda1409f45b3804a9854ecdf6d (diff) | |
| download | nixpkgs-91da60610175beebd78132591d39b49897aa380d.tar nixpkgs-91da60610175beebd78132591d39b49897aa380d.tar.gz nixpkgs-91da60610175beebd78132591d39b49897aa380d.tar.bz2 nixpkgs-91da60610175beebd78132591d39b49897aa380d.tar.lz nixpkgs-91da60610175beebd78132591d39b49897aa380d.tar.xz nixpkgs-91da60610175beebd78132591d39b49897aa380d.tar.zst nixpkgs-91da60610175beebd78132591d39b49897aa380d.zip | |
gnutls: Fix parallel build issue introduced in 3.4.x
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.4.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index d5f74802fa5..debdfadcf34 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { version = "3.4.4"; @@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz"; sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75"; }; + + # This fixes some broken parallel dependencies + postPatch = '' + sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am + ''; + + nativeBuildInputs = [ autoreconfHook ]; }) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 21fb721a079..0c2e3429159 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -3,15 +3,15 @@ , tpmSupport ? false, trousers # Version dependent args -, version, src, patches ? [] +, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] , ...}: assert guileBindings -> guile != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnutls-${version}"; - inherit src patches; + inherit src patches postPatch; outputs = [ "out" "man" ]; @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ]; + # AutoreconfHook is temporary until the patch lands upstream to fix + # header file generation with parallel building + nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . |