diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix index 98c94cfeccaa..95f09f595048 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix @@ -11,13 +11,11 @@ , libtool , gettext , dbus -, telepathy-glib , gtk3 , json-glib , librdf_raptor2 -, dbus-glib , pythonSupport ? true -, python2Packages +, python3 }: stdenv.mkDerivation rec { @@ -50,23 +48,21 @@ stdenv.mkDerivation rec { gettext gobject-introspection vala - python2Packages.python + python3 ]; buildInputs = [ glib sqlite dbus - telepathy-glib - dbus-glib gtk3 json-glib librdf_raptor2 - python2Packages.rdflib + python3.pkgs.rdflib ]; configureFlags = [ - "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" + "--disable-telepathy" ]; enableParallelBuilding = true; @@ -80,14 +76,14 @@ stdenv.mkDerivation rec { ''; postFixup = stdenv.lib.optionalString pythonSupport '' - moveToOutput lib/${python2Packages.python.libPrefix} "$py" + moveToOutput lib/${python3.libPrefix} "$py" ''; meta = with stdenv.lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; maintainers = with maintainers; [ lethalman worldofpeace ]; - license = licenses.gpl2; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } |