about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSou Bunnbu <iyzsong@gmail.com>2015-02-03 11:21:22 +0800
committerSou Bunnbu <iyzsong@gmail.com>2015-02-03 11:21:22 +0800
commit7f17bfc37b838d582202ab56e9999114856634fb (patch)
tree58f601ffa4948a158cd59f1dbc105cd0b6c9353e /pkgs
parentaea1254f96b068d370cb0dbc16638e7cef8ba84c (diff)
parent1c0c07c2ed0602b413d47dafc4824b0e7bb4a34d (diff)
downloadnixlib-7f17bfc37b838d582202ab56e9999114856634fb.tar
nixlib-7f17bfc37b838d582202ab56e9999114856634fb.tar.gz
nixlib-7f17bfc37b838d582202ab56e9999114856634fb.tar.bz2
nixlib-7f17bfc37b838d582202ab56e9999114856634fb.tar.lz
nixlib-7f17bfc37b838d582202ab56e9999114856634fb.tar.xz
nixlib-7f17bfc37b838d582202ab56e9999114856634fb.tar.zst
nixlib-7f17bfc37b838d582202ab56e9999114856634fb.zip
Merge pull request #6113 from AndersonTorres/windowmaker
WindowMaker: adding support for more image formats
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/window-managers/windowmaker/default.nix17
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index 85663ff3bf5f..c5ecefdcfc8d 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXmu }:
+{ stdenv, fetchurl, pkgconfig
+, libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm
+, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
 
 stdenv.mkDerivation rec {
   name = "windowmaker-${version}";
@@ -10,7 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3";
   };
 
-  buildInputs = [ pkgconfig libX11 libXft libXmu ];
+  buildInputs = [ pkgconfig
+                  libX11 libXext libXft libXmu libXinerama libXrandr libXpm
+                  imagemagick libpng libjpeg libexif libtiff libungif libwebp ];
+
+  configureFlags = [
+    "--with-x"
+    "--enable-modelock"
+    "--enable-randr"
+    "--enable-magick"
+  ];
 
   meta = with stdenv.lib; {
     homepage = http://windowmaker.org/;
@@ -27,3 +38,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.AndersonTorres ];
   };
 }
+
+# TODO: investigate support for WEBP (its autodetection is failing)