From ddf156ffa94f3b67244722c40996d1c4b0155fd3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 7 Jul 2018 18:50:00 +0200
Subject: bamf: various improvements

Fix systemd user unit directory, add test dependencies,
split package into multiple outputs, and clean up a bit.
---
 pkgs/development/libraries/bamf/default.nix | 30 ++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index dd926ac2081..0a2badea7cb 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
 , libstartup_notification, gobjectIntrospection, gtk-doc
-, python27, pythonPackages, libxml2 }:
+, xorgserver, dbus, python2 }:
 
 stdenv.mkDerivation rec {
   pname = "bamf";
   version = "0.5.3";
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "devdoc" ];
+
   src = fetchurl {
     url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
     sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
@@ -16,22 +18,40 @@ stdenv.mkDerivation rec {
     pkgconfig
     gtk-doc
     gobjectIntrospection
+    vala
+    # Tests
+    xorgserver
+    dbus
+    (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
   ];
 
-  buildInputs = [ libgtop libwnck3 vala libstartup_notification
-                  python27 pythonPackages.libxslt libxml2 glib ];
+  buildInputs = [
+    libgtop
+    libwnck3
+    libstartup_notification
+    glib
+  ];
 
+  # Fix hard-coded path
+  # https://bugs.launchpad.net/bamf/+bug/1780557
   postPatch = ''
     substituteInPlace data/Makefile.in \
-      --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user'
+      --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
   '';
 
+  configureFlags = [
+    "--enable-headless-tests"
+  ];
+
   # fix paths
   makeFlags = [
-    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
     "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
   ];
 
+  # TODO: Requires /etc/machine-id
+  doCheck = false;
+
   # ignore deprecation errors
   NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
 
-- 
cgit 1.4.1