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

gnutls: Fix parallel build issue introduced in 3.4.x

Browse Source
This commit is contained in:
William A. Kennington III 2015-09-09 13:05:00 -07:00
parent 1f45b59885
commit 91da606101
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gnutls/3.4.nix
View File

@ -1,4 +1,4 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, autoreconfHook, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "3.4.4"; 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"; url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75"; sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75";
}; };
# This fixes some broken parallel dependencies
postPatch = ''
sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am
'';
nativeBuildInputs = [ autoreconfHook ];
}) })

10
pkgs/development/libraries/gnutls/generic.nix
View File

@ -3,15 +3,15 @@
, tpmSupport ? false, trousers , tpmSupport ? false, trousers
# Version dependent args # Version dependent args
, version, src, patches ? [] , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
, ...}: , ...}:
assert guileBindings -> guile != null; assert guileBindings -> guile != null;
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "gnutls-${version}"; name = "gnutls-${version}";
inherit src patches; inherit src patches postPatch;
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -34,7 +34,9 @@ stdenv.mkDerivation rec {
++ [ unbound ] ++ [ unbound ]
++ lib.optional guileBindings guile; ++ 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: # XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw . # http://hydra.nixos.org/build/2962084/nixlog/1/raw .

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

@ -6504,13 +6504,11 @@ let
gnutls = gnutls34; gnutls = gnutls34;
gnutls33 = import ../development/libraries/gnutls/3.3.nix { gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
inherit callPackage fetchurl;
guileBindings = config.gnutls.guile or false; guileBindings = config.gnutls.guile or false;
}; };
gnutls34 = import ../development/libraries/gnutls/3.4.nix { gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
inherit callPackage fetchurl;
guileBindings = config.gnutls.guile or false; guileBindings = config.gnutls.guile or false;
}; };