bamf: various improvements

Fix systemd user unit directory, add test dependencies,
split package into multiple outputs, and clean up a bit.
This commit is contained in:
Jan Tojnar 2018-07-07 18:50:00 +02:00
parent bf09bb5ef0
commit ddf156ffa9

View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig { stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
, libstartup_notification, gobjectIntrospection, gtk-doc , libstartup_notification, gobjectIntrospection, gtk-doc
, python27, pythonPackages, libxml2 }: , xorgserver, dbus, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bamf"; pname = "bamf";
version = "0.5.3"; version = "0.5.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz"; url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l"; sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
@ -16,22 +18,40 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
gtk-doc gtk-doc
gobjectIntrospection gobjectIntrospection
vala
# Tests
xorgserver
dbus
(python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
]; ];
buildInputs = [ libgtop libwnck3 vala libstartup_notification buildInputs = [
python27 pythonPackages.libxslt libxml2 glib ]; libgtop
libwnck3
libstartup_notification
glib
];
# Fix hard-coded path
# https://bugs.launchpad.net/bamf/+bug/1780557
postPatch = '' postPatch = ''
substituteInPlace data/Makefile.in \ 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 # fix paths
makeFlags = [ makeFlags = [
"INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
]; ];
# TODO: Requires /etc/machine-id
doCheck = false;
# ignore deprecation errors # ignore deprecation errors
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";