mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
zeitgeist: 1.0 → 1.0.1
https://cgit.freedesktop.org/zeitgeist/zeitgeist/commit/?id=3cf082f10692ab8fd75a0a59dfa6a97b77a39bd6
This commit is contained in:
parent
c65cd765f6
commit
6d1ee45302
@ -1,10 +0,0 @@
|
|||||||
--- configure.ac 2014-01-27 22:45:42.000000000 +0100
|
|
||||||
+++ configure.ac.new 2014-05-02 17:25:45.813491239 +0200
|
|
||||||
@@ -151,6 +151,7 @@
|
|
||||||
gio-2.0 >= $GLIB_REQUIRED
|
|
||||||
gio-unix-2.0 >= $GLIB_REQUIRED
|
|
||||||
gtk+-3.0 >= $GTK_REQUIRED
|
|
||||||
+ dbus-glib-1
|
|
||||||
json-glib-1.0 >= $JSON_GLIB_REQUIRED"
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([datahub],
|
|
@ -1,37 +1,34 @@
|
|||||||
{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38
|
{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38
|
||||||
, intltool, libtool, dbus_libs, telepathy-glib
|
, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib
|
||||||
, gtk3, json-glib, librdf_raptor2, dbus-glib
|
, gtk3, json-glib, librdf_raptor2, dbus-glib
|
||||||
, pythonSupport ? true, python2Packages
|
, pythonSupport ? true, python2Packages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.0";
|
version = "1.0.1";
|
||||||
name = "zeitgeist-${version}";
|
name = "zeitgeist-${version}";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";
|
url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8";
|
sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureScript = "./autogen.sh";
|
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
|
||||||
|
|
||||||
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
|
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig gnome3.gnome-common intltool libtool vala_0_38 ];
|
nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ];
|
||||||
buildInputs = [ glib sqlite dbus_libs telepathy-glib dbus-glib
|
buildInputs = [
|
||||||
gtk3 json-glib librdf_raptor2 python2Packages.rdflib ];
|
glib sqlite dbus_libs telepathy-glib dbus-glib
|
||||||
|
gtk3 json-glib librdf_raptor2 python2Packages.rdflib
|
||||||
|
];
|
||||||
|
|
||||||
prePatch = "patchShebangs .";
|
prePatch = "patchShebangs .";
|
||||||
|
|
||||||
patches = [ ./dbus_glib.patch ];
|
|
||||||
|
|
||||||
patchFlags = [ "-p0" ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = stdenv.lib.optionalString pythonSupport ''
|
||||||
'' + stdenv.lib.optionalString pythonSupport ''
|
|
||||||
moveToOutput lib/${python2Packages.python.libPrefix} "$py"
|
moveToOutput lib/${python2Packages.python.libPrefix} "$py"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user