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

gnupg: Rename parameter x11Support -> guiSupport

Browse Source 
Because it is really about GUI in general, not X11 (e.g. OS X).
This commit is contained in:
Kirill Elagin 2016-06-17 11:26:41 +03:00
parent 9ab271a4be
commit 62d9edb9b9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,13 @@
# Each of the dependencies below are optional. # Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality. # Gnupg can be built without them at the cost of reduced functionality.
, pinentry ? null, x11Support ? true , pinentry ? null, guiSupport ? true
, openldap ? null, bzip2 ? null, libusb ? null, curl ? null , openldap ? null, bzip2 ? null, libusb ? null, curl ? null
}: }:
with stdenv.lib; with stdenv.lib;
assert x11Support -> pinentry != null; assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnupg-2.0.30"; name = "gnupg-2.0.30";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
patch gl/stdint_.h < ${./clang.patch} patch gl/stdint_.h < ${./clang.patch}
''; '';
configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/bin/pinentry";
postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";

6
pkgs/tools/security/gnupg/21.nix
View File

@ -3,14 +3,14 @@
# Each of the dependencies below are optional. # Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality. # Gnupg can be built without them at the cost of reduced functionality.
, pinentry ? null, x11Support ? true , pinentry ? null, guiSupport ? true
, adns ? null, gnutls ? null, libusb ? null, openldap ? null , adns ? null, gnutls ? null, libusb ? null, openldap ? null
, readline ? null, zlib ? null, bzip2 ? null , readline ? null, zlib ? null, bzip2 ? null
}: }:
with stdenv.lib; with stdenv.lib;
assert x11Support -> pinentry != null; assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnupg-${version}"; name = "gnupg-${version}";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-( ''; #" fix Emacs syntax highlighting :-(
configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/bin/pinentry";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://gnupg.org; homepage = http://gnupg.org;