diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2017-08-10 11:43:48 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-11 19:24:06 +0200 |
| commit | e34ce9d1c551fb43742aada6bb43ccb1a52e64a1 (patch) | |
| tree | e20c090163bad0902265eb5b9d2d7ab28a2b3be5 /pkgs/tools/misc/pipelight | |
| parent | d8f08bb088f662a16768ba4e205b2951e0a23bdc (diff) | |
| download | nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.gz nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.bz2 nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.lz nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.xz nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.zst nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.zip | |
gnupg: 2.1.22 -> 2.1.23
This release in a RC for gnupg-2.2. The main difference as far as nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and `gpgv2` is called `gpgv`. This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs, but there might be some packaged software that internally use `gpg2` not handeled by this commit. See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html for full release information
Diffstat (limited to 'pkgs/tools/misc/pipelight')
| -rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/pipelight/pipelight.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 16f50436990..c68d41532c2 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { --prefix=$out \ --moz-plugin-path=$out/${mozillaPluginPath} \ --wine-path=${wine_custom} \ - --gpg-exec=${gnupg}/bin/gpg2 \ + --gpg-exec=${gnupg}/bin/gpg \ --bash-interp=${bash}/bin/bash \ --downloader=${curl.bin}/bin/curl $configureFlags diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch index 66dd0fdab4c..fc6666f8f12 100644 --- a/pkgs/tools/misc/pipelight/pipelight.patch +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -62,7 +62,7 @@ diff -urN pipelight.old/configure pipelight.new/configure - gpg_exec="/usr/bin/gpg" -fi +bash_interp=bash -+gpg_exec=gpg2 ++gpg_exec=gpg moz_plugin_path="" gcc_runtime_dlls="" so_mode="0644" |