From 0cd638b2917f749cb60f0b96be0c804953856b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 17 Sep 2018 17:29:58 +0200 Subject: [PATCH] playerctl: switch to meson and fix build --- pkgs/tools/audio/playerctl/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index d2a7358ff8fd..497e17e3cc0f 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome2, glib, - pkgconfig, gobjectIntrospection }: +{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { name = "playerctl-${version}"; @@ -12,13 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - which autoconf automake libtool gnome2.gtkdoc glib - gobjectIntrospection - ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ glib ]; - preConfigure = "./autogen.sh"; + # docs somehow crashes the install phase: + # https://github.com/acrisci/playerctl/issues/85 + mesonFlags = [ "-Dgtk-doc=false" ]; meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS";