summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorSou Bunnbu <iyzsong@member.fsf.org>2015-12-09 16:25:51 +0800
committerSou Bunnbu <iyzsong@member.fsf.org>2015-12-09 16:25:51 +0800
commita190cb7636ff57737fae695c043805f1536aaefe (patch)
tree4bfead48e13a65beb1178c612e74e93c94cbaf22 /pkgs/applications/window-managers
parentc16f90f515856bad037e579f131a5ea61ce6699f (diff)
parent523d6846a77f14960d9541b88c24f31920c36f8a (diff)
downloadnixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.tar
nixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.tar.gz
nixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.tar.bz2
nixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.tar.lz
nixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.tar.xz
nixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.tar.zst
nixpkgs-a190cb7636ff57737fae695c043805f1536aaefe.zip
Merge pull request #11432 from edanaher/fvwm-gestures
Fvwm: add gestures and create libstroke package
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/fvwm/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 6830e3a1c01..aded77a466d 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -1,8 +1,12 @@
-{ stdenv, fetchurl, pkgconfig
+{ gestures ? false
+, stdenv, fetchurl, pkgconfig
 , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
 , libXpm, librsvg, libpng, fribidi, perl
+, libstroke ? null
 }:
 
+assert gestures -> libstroke != null;
+
 stdenv.mkDerivation rec {
   name = "fvwm-2.6.5";
 
@@ -15,7 +19,7 @@ stdenv.mkDerivation rec {
     pkgconfig cairo fontconfig freetype
     libXft libXcursor libXinerama libXpm
     librsvg libpng fribidi perl
-  ];
+  ] ++ stdenv.lib.optional gestures libstroke;
 
   meta = {
     homepage = "http://fvwm.org";