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

Pass coreutils explicitly instead of using stdenv.coreutils

Browse Source 
I hope that this fixes tarball creation for hydra

svn path=/nixpkgs/trunk/; revision=21886
This commit is contained in:
Yury G. Kudryashov 2010-05-19 20:59:07 +00:00
parent fd63f04e4e
commit b7a54122ef
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/security/gnupg/default.nix
View File

@ -1,8 +1,9 @@
# Remember to install Pinentry and # Remember to install Pinentry and
# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'. # 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan, libksba { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null , libksba, coreutils, useLdap ? true, openldap ? null
, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null
, useCurl ? true, curl ? null , useCurl ? true, curl ? null
}: }:
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional useCurl curl; ++ stdenv.lib.optional useCurl curl;
patchPhase = '' patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${stdenv.coreutils}&@g' -i find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
''; '';
checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";

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

@ -818,7 +818,7 @@ let
gnupg = makeOverridable (import ../tools/security/gnupg) { gnupg = makeOverridable (import ../tools/security/gnupg) {
inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib
openldap bzip2 libusb curl; openldap bzip2 libusb curl coreutils;
}; };
gnuplot = makeOverridable (import ../tools/graphics/gnuplot) { gnuplot = makeOverridable (import ../tools/graphics/gnuplot) {