workrave: minor edits for consistency

Mainly dropping the partial use of xorg.<lib> and separating
nativeBuildInputs.
This commit is contained in:
Tobias Geerinckx-Rice 2016-04-30 20:45:47 +02:00
parent 950a698488
commit 2b48d3dae6
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99

View File

@ -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";