aboutsummaryrefslogtreecommitdiff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-12-06 11:48:51 +0100
committerGitHub <noreply@github.com>2020-12-06 11:48:51 +0100
commitb6e98f18950c2b5dbdc725c1181df2ad1be19fee (patch)
tree9bdf06789781a81e9a71caab0f308d8cb80f413a /pkgs/build-support
parent46f7fbd5fcaefedcb531da14f30371246b4bdef2 (diff)
parent01bb2154bb42c409d331d0a8769cfcd37118229e (diff)
Merge pull request #105584 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
index 5a87893d9726..d0ea088bf71e 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix
@@ -3,6 +3,7 @@
, makeSetupHook
, makeWrapper
, gobject-introspection
+, isGraphical ? true
, gtk3
, librsvg
, dconf
@@ -21,7 +22,7 @@ makeSetupHook {
# Unfortunately, it also requires the user to have dconf
# D-Bus service enabled globally (e.g. through a NixOS module).
dconf.lib
- ] ++ [
+ ] ++ lib.optionals isGraphical [
# TODO: remove this, packages should depend on GTK explicitly.
gtk3
@@ -30,6 +31,7 @@ makeSetupHook {
# graphics in GTK (e.g. cross for closing window in window title bar)
# so it is pretty much required for applications using GTK.
librsvg
+ ] ++ [
# We use the wrapProgram function.
makeWrapper