diff options
author | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
commit | 3f45f0948d6fe158bed063adb66850ded0ba4861 (patch) | |
tree | ac717689d391d3f5333132fc34e4b2aed829414c /pkgs/tools/security/gnupg/1compat.nix | |
parent | a9b942c0617b1cd5f0732d05eadad0114a178f37 (diff) | |
parent | d227d9a70e41d65e4e6f4ac75a9d243c5a19fa85 (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/security/gnupg/1compat.nix')
-rw-r--r-- | pkgs/tools/security/gnupg/1compat.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 9bd71467f0eaf..d875413cc7917 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { builder = writeScript "gnupg1compat-builder" '' # First symlink all top-level dirs ${coreutils}/bin/mkdir -p $out - ${coreutils}/bin/ln -s ${gnupg}/* $out + ${coreutils}/bin/ln -s "${gnupg}/"* $out # Replace bin with directory and symlink it contents ${coreutils}/bin/rm $out/bin ${coreutils}/bin/mkdir -p $out/bin - ${coreutils}/bin/ln -s ${gnupg}/bin/* $out/bin + ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin # Add gpg->gpg2 and gpgv->gpgv2 symlinks ${coreutils}/bin/ln -s gpg2 $out/bin/gpg |