about summary refs log tree commit diff
path: root/pkgs/applications/misc/workrave/default.nix
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2016-04-30 20:45:47 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2016-05-01 01:58:28 +0200
commit2b48d3dae6a73ca5a92ab3955344e020dbf0d372 (patch)
tree967d7de0cabdd25a97e6a9bdf60e78ec0f096468 /pkgs/applications/misc/workrave/default.nix
parent950a698488518447f3b085df153408ed5605574c (diff)
downloadnixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.tar
nixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.tar.gz
nixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.tar.bz2
nixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.tar.lz
nixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.tar.xz
nixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.tar.zst
nixlib-2b48d3dae6a73ca5a92ab3955344e020dbf0d372.zip
workrave: minor edits for consistency
Mainly dropping the partial use of xorg.<lib> and separating
nativeBuildInputs.
Diffstat (limited to 'pkgs/applications/misc/workrave/default.nix')
-rw-r--r--pkgs/applications/misc/workrave/default.nix24
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index f8ec86dd2b39..d082cc30bd7b 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,13 +1,8 @@
-{ stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig,
-  libXtst, cheetah, libXScrnSaver, xorg,
-  glib, glibmm,
-  gtk, gtkmm,
-  atk,
-  pango, pangomm,
-  cairo, cairomm,
-  dbus, dbus_glib,
-  GConf, gconfmm,
-  gdome2, gstreamer, libsigcxx }:
+{ stdenv, fetchurl
+, autoconf, automake, gettext, intltool, libtool, pkgconfig
+, libICE, libSM, libXScrnSaver, libXtst, cheetah
+, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
+, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
   version = "1.10.6";
@@ -22,12 +17,13 @@ stdenv.mkDerivation rec {
     sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
   };
 
+  nativeBuildInputs = [
+    autoconf automake gettext intltool libtool pkgconfig
+  ];
   buildInputs = [
-    autoconf automake gettext intltool libtool pkgconfig libXtst cheetah
-    libXScrnSaver
-
+    libICE libSM libXScrnSaver libXtst cheetah
     glib glibmm gtk gtkmm atk pango pangomm cairo cairomm
-    dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx xorg.libICE xorg.libSM
+    dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
   ];
 
   preConfigure = "./autogen.sh";