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

Merge pull request #47977 from charles-dyfis-net/gnupg20-1compat-fix

Browse Source 
gnupg1compat: fix compatibility with gnupg20
This commit is contained in:
Lancelot SIX 2018-10-10 15:04:27 +02:00 committed by GitHub
commit 20249caf14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/security/gnupg/1compat.nix
View File

@ -4,14 +4,22 @@ stdenv.mkDerivation {
name = "gnupg1compat-${gnupg.version}"; name = "gnupg1compat-${gnupg.version}";
builder = writeScript "gnupg1compat-builder" '' builder = writeScript "gnupg1compat-builder" ''
PATH=${coreutils}/bin
# First symlink all top-level dirs # First symlink all top-level dirs
${coreutils}/bin/mkdir -p $out mkdir -p $out
${coreutils}/bin/ln -s "${gnupg}/"* $out ln -s "${gnupg}/"* $out
# Replace bin with directory and symlink it contents # Replace bin with directory and symlink it contents
${coreutils}/bin/rm $out/bin rm $out/bin
${coreutils}/bin/mkdir -p $out/bin mkdir -p $out/bin
${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin ln -s "${gnupg}/bin/"* $out/bin
# Add symlinks for any executables that end in 2 and lack any non-*2 version
for f in $out/bin/*2; do
[[ -x $f ]] || continue # ignore failed globs and non-executable files
[[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions
ln -s -- "''${f##*/}" "''${f%2}"
done
''; '';
meta = gnupg.meta // { meta = gnupg.meta // {

3
pkgs/tools/security/gnupg/20.nix
View File

@ -12,7 +12,8 @@ with stdenv.lib;
assert guiSupport -> pinentry != null; assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnupg-2.0.30"; name = "gnupg-${version}";
version = "2.0.30";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2"; url = "mirror://gnupg/gnupg/${name}.tar.bz2";