From 2b48d3dae6a73ca5a92ab3955344e020dbf0d372 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Apr 2016 20:45:47 +0200
Subject: [PATCH] workrave: minor edits for consistency

Mainly dropping the partial use of xorg.<lib> and separating
nativeBuildInputs.
---
 pkgs/applications/misc/workrave/default.nix | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index f8ec86dd2b3..d082cc30bd7 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";