diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-19 20:59:07 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-19 20:59:07 +0000 |
| commit | b7a54122ef5d08265a2acafca2ae946f97d1e158 (patch) | |
| tree | e659daf2600824f9c94d5ee60013e2d75ac19e0e | |
| parent | fd63f04e4e972f0ff8a4e70527dc8e4f8595b603 (diff) | |
| download | nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.tar nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.tar.gz nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.tar.bz2 nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.tar.lz nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.tar.xz nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.tar.zst nixlib-b7a54122ef5d08265a2acafca2ae946f97d1e158.zip | |
Pass coreutils explicitly instead of using stdenv.coreutils
I hope that this fixes tarball creation for hydra svn path=/nixpkgs/trunk/; revision=21886
| -rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 1da3e4e51a22..7b89dcb25b87 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -1,8 +1,9 @@ # Remember to install Pinentry and # 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'. -{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan, libksba -, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null +{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan +, libksba, coreutils, useLdap ? true, openldap ? null +, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null , useCurl ? true, curl ? null }: @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional useCurl curl; 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c32d40b4493..a9826045d365 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -818,7 +818,7 @@ let gnupg = makeOverridable (import ../tools/security/gnupg) { 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) { |