diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 07:12:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-26 05:28:45 +0100 |
| commit | 6d1ee453027da82c0380f0c64225bbe5fc9b3fad (patch) | |
| tree | c5fc8589b891227b231018ce828f6680a76d922f /pkgs/development/libraries/zeitgeist | |
| parent | c65cd765f685023ef646f6ed89d47d75b2c955a6 (diff) | |
| download | nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.tar nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.tar.gz nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.tar.bz2 nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.tar.lz nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.tar.xz nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.tar.zst nixpkgs-6d1ee453027da82c0380f0c64225bbe5fc9b3fad.zip | |
zeitgeist: 1.0 → 1.0.1
https://cgit.freedesktop.org/zeitgeist/zeitgeist/commit/?id=3cf082f10692ab8fd75a0a59dfa6a97b77a39bd6
Diffstat (limited to 'pkgs/development/libraries/zeitgeist')
| -rw-r--r-- | pkgs/development/libraries/zeitgeist/dbus_glib.patch | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/zeitgeist/default.nix | 25 |
2 files changed, 11 insertions, 24 deletions
diff --git a/pkgs/development/libraries/zeitgeist/dbus_glib.patch b/pkgs/development/libraries/zeitgeist/dbus_glib.patch deleted file mode 100644 index 872ea0db31b..00000000000 --- a/pkgs/development/libraries/zeitgeist/dbus_glib.patch +++ /dev/null @@ -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], diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 66befe50f39..33cf5dd4af8 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 -, intltool, libtool, dbus_libs, telepathy-glib +{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 +, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib , gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.1"; name = "zeitgeist-${version}"; src = fetchgit { url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; 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" ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome-common intltool libtool vala_0_38 ]; - buildInputs = [ glib sqlite dbus_libs telepathy-glib dbus-glib - gtk3 json-glib librdf_raptor2 python2Packages.rdflib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; + buildInputs = [ + glib sqlite dbus_libs telepathy-glib dbus-glib + gtk3 json-glib librdf_raptor2 python2Packages.rdflib + ]; prePatch = "patchShebangs ."; - patches = [ ./dbus_glib.patch ]; - - patchFlags = [ "-p0" ]; - enableParallelBuilding = true; - postFixup = '' - '' + stdenv.lib.optionalString pythonSupport '' + postFixup = stdenv.lib.optionalString pythonSupport '' moveToOutput lib/${python2Packages.python.libPrefix} "$py" ''; |