diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-06-24 17:01:21 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-06-25 18:24:52 +0200 |
| commit | 3238567677df5fc0faa3aa4353b260d157e16b19 (patch) | |
| tree | 98d48c403dba6a72184ae6af52971a8e950b1017 /pkgs/applications/misc/girara | |
| parent | 4fa19ba151e475f289c00d2c2f034e4e512dc064 (diff) | |
| download | nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.tar nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.tar.gz nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.tar.bz2 nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.tar.lz nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.tar.xz nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.tar.zst nixpkgs-3238567677df5fc0faa3aa4353b260d157e16b19.zip | |
girara: fix build with auto_features=enabled
Also split multiple outputs and enable tests.
Diffstat (limited to 'pkgs/applications/misc/girara')
| -rw-r--r-- | pkgs/applications/misc/girara/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 919f20f1398..977bd17fb51 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl +{ stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { - name = "girara-${version}"; + pname = "girara"; version = "0.3.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { - url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/girara/download/${pname}-${version}.tar.xz"; sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - buildInputs = [ libintl libiconv ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; + buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; + doCheck = true; + + mesonFlags = [ + "-Ddocs=disabled" # docs do not seem to be installed + ]; + + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + meta = with stdenv.lib; { homepage = https://pwmt.org/projects/girara/; description = "User interface library"; |