summaryrefslogtreecommitdiffstats
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-08-23 14:54:54 -0500
committerWill Dietz <w@wdtz.org>2019-09-03 20:21:11 -0500
commit60256c197da3845768e3dd6aa61bff3370eb0284 (patch)
treeb9fb05edf83f618635c7d5b44f66f07350584418 /pkgs/os-specific
parent39d343929d0c64b2a68dd0f5e06cc81c4c220808 (diff)
usbguard: 0.7.4 -> 0.7.5
https://github.com/USBGuard/usbguard/releases/tag/usbguard-0.7.5 * no longer needs/uses qt as of 0.7.5 * asciidoctor -> asciidoc, drop pandoc (pandoc only seems to be used as part of doc spell-check which we don't enable anyway) * docbook bits
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/usbguard/default.nix22
1 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index efc7406cc194..a9983561345e 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -1,11 +1,8 @@
{
stdenv, fetchurl, lib,
- pkgconfig, libxml2, libxslt,
- dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, audit,
- withGui ? true,
- qtbase ? null,
- qttools ? null,
- qtsvg ? null,
+ pkgconfig, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl, asciidoc,
+ dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf,
+ audit,
libgcrypt ? null,
libsodium ? null
}:
@@ -15,20 +12,23 @@ with stdenv.lib;
assert libgcrypt != null -> libsodium == null;
stdenv.mkDerivation rec {
- version = "0.7.4";
+ version = "0.7.5";
pname = "usbguard";
repo = "https://github.com/USBGuard/usbguard";
src = fetchurl {
url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k";
+ sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b";
};
nativeBuildInputs = [
+ asciidoc
pkgconfig
libxslt # xsltproc
libxml2 # xmllint
+ docbook_xml_dtd_45
+ docbook_xsl
];
buildInputs = [
@@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
audit
]
++ (lib.optional (libgcrypt != null) libgcrypt)
- ++ (lib.optional (libsodium != null) libsodium)
- ++ (lib.optionals withGui [ qtbase qtsvg qttools ]);
+ ++ (lib.optional (libsodium != null) libsodium);
configureFlags = [
"--with-bundled-catch"
@@ -51,8 +50,7 @@ stdenv.mkDerivation rec {
"--with-polkit"
]
++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
- ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium")
- ++ (lib.optional withGui "--with-gui-qt=qt5");
+ ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
enableParallelBuilding = true;