public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

workrave: minor edits for consistency

Browse Source 
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
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/misc/workrave/default.nix
View File

@ -1,13 +1,8 @@
{ stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig, { stdenv, fetchurl
libXtst, cheetah, libXScrnSaver, xorg, , autoconf, automake, gettext, intltool, libtool, pkgconfig
glib, glibmm, , libICE, libSM, libXScrnSaver, libXtst, cheetah
gtk, gtkmm, , glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
atk, , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
pango, pangomm,
cairo, cairomm,
dbus, dbus_glib,
GConf, gconfmm,
gdome2, gstreamer, libsigcxx }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.10.6"; version = "1.10.6";
@ -22,12 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq"; sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
}; };
nativeBuildInputs = [
autoconf automake gettext intltool libtool pkgconfig
];
buildInputs = [ buildInputs = [
autoconf automake gettext intltool libtool pkgconfig libXtst cheetah libICE libSM libXScrnSaver libXtst cheetah
libXScrnSaver
glib glibmm gtk gtkmm atk pango pangomm cairo cairomm 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"; preConfigure = "./autogen.sh";