Merge pull request #7072 from oxij/x11support-trivial

x11Support: trivial

pkgs/tools/security/gnupg/20.nix

@@ -1,10 +1,16 @@
 { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
 , libksba, coreutils, libiconv, pcsclite
+
 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
-, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
+, pinentry ? null, x11Support ? true
+, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
 }:
 
+with stdenv.lib;
+
+assert x11Support -> pinentry != null;
+
 stdenv.mkDerivation rec {
   name = "gnupg-2.0.27";
 
@@ -27,9 +33,7 @@ stdenv.mkDerivation rec {
     patch gl/stdint_.h < ${./clang.patch}
   '';
 
-  configureFlags =
+  configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
-    if pinentry != null then "--with-pinentry-pgm=${pinentry}/bin/pinentry"
-                        else "";
 
   checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
 

pkgs/tools/security/gnupg/21.nix

@@ -1,10 +1,17 @@
 { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth
-, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null
+, autoreconfHook, gettext, texinfo, pcsclite
-, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo
+
-, pcsclite
+# Each of the dependencies below are optional.
+# Gnupg can be built without them at the cost of reduced functionality.
+, pinentry ? null, x11Support ? true
+, adns ? null, gnutls ? null, libusb ? null, openldap ? null
+, readline ? null, zlib ? null, bzip2 ? null
 }:
 
 with stdenv.lib;
+
+assert x11Support -> pinentry != null;
+
 stdenv.mkDerivation rec {
   name = "gnupg-2.1.2";
 
@@ -21,12 +28,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libgcrypt libassuan libksba npth
-    readline libusb gnutls adns openldap zlib bzip2
     autoreconfHook gettext texinfo
+    readline libusb gnutls adns openldap zlib bzip2
   ];
 
-  configureFlags =
+  configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
-    optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry";
 
   meta = with stdenv.lib; {
     homepage = http://gnupg.org;

pkgs/tools/security/pass/default.nix

@@ -1,12 +1,14 @@
 { stdenv, fetchurl
 , coreutils, gnused, getopt, pwgen, git, tree, gnupg
 , makeWrapper
-, withX ? true, xclip, xdotool, dmenu
+
+, xclip ? null, xdotool ? null, dmenu ? null
+, x11Support ? true
 }:
 
-assert withX -> xclip != null;
+assert x11Support -> xclip != null
-assert withX -> xdotool != null;
+                  && xdotool != null
-assert withX -> dmenu != null;
+                  && dmenu != null;
 
 stdenv.mkDerivation rec {
   version = "1.6.5";
@@ -52,7 +54,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/share/emacs/site-lisp"
     cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
 
-    ${if withX then ''
+    ${if x11Support then ''
       cp "contrib/dmenu/passmenu" "$out/bin/"
     '' else ""}
   '';
@@ -64,9 +66,9 @@ stdenv.mkDerivation rec {
 
     # Ensure all dependencies are in PATH
     wrapProgram $out/bin/pass \
-      --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if withX then ":${xclip}/bin" else ""}"
+      --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if x11Support then ":${xclip}/bin" else ""}"
 
-    ${if withX then ''
+    ${if x11Support then ''
       wrapProgram $out/bin/passmenu \
         --prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin"
     '' else ""}