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

Merge pull request #56421 from Ericson2314/pinenty-dedup

Browse Source 
pinentry: Use lib.string.{enable,with}Feature to avoid duplication
This commit is contained in:
Matthew Bauer 2019-02-26 17:31:03 -05:00 committed by GitHub
commit dd94b0724c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/security/pinentry/default.nix
View File

@ -1,13 +1,8 @@
{ fetchurl, fetchpatch, stdenv, lib, pkgconfig { fetchurl, fetchpatch, stdenv, lib, pkgconfig
, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null , libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null
, enableEmacs ? false , enableEmacs ? false
}: }:
let
mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}";
mkEnable = mkFlag "enable" "disable";
mkWith = mkFlag "with" "without";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pinentry-1.1.0"; name = "pinentry-1.1.0";
@ -30,14 +25,14 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
(mkWith (libcap != null) "libcap") (stdenv.lib.withFeature (libcap != null) "libcap")
(mkEnable (libsecret != null) "libsecret") (stdenv.lib.enableFeature (libsecret != null) "libsecret")
(mkEnable (ncurses != null) "pinentry-curses") (stdenv.lib.enableFeature (ncurses != null) "pinentry-curses")
(mkEnable true "pinentry-tty") (stdenv.lib.enableFeature true "pinentry-tty")
(mkEnable enableEmacs "pinentry-emacs") (stdenv.lib.enableFeature enableEmacs "pinentry-emacs")
(mkEnable (gtk2 != null) "pinentry-gtk2") (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2")
(mkEnable (gcr != null) "pinentry-gnome3") (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3")
(mkEnable (qt != null) "pinentry-qt") (stdenv.lib.enableFeature (qt != null) "pinentry-qt")
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];