From 38cc4f9f339547614b0519c31127ba131b8ef79c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Oct 2017 20:23:56 +0200 Subject: [PATCH] ncmpc: 0.27 -> 0.28 --- pkgs/applications/audio/ncmpc/default.nix | 31 +++++++++++------------ 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index e43120a715d..ef0bb75b2ec 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,36 +1,35 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +, mpd_clientlib, gettext }: -stdenv.mkDerivation rec { +let + rpath = stdenv.lib.makeLibraryPath [ + glib ncurses mpd_clientlib + ]; +in stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr"; + sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; }; buildInputs = [ glib ncurses mpd_clientlib ]; - # ++ libintlOrEmpty; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - # without this, po/Makefile.in.in is not being created - preAutoreconf = '' - ./autogen.sh + postFixup = '' + for elf in "$out"/bin/*; do + patchelf --set-rpath '${rpath}':"$out/lib" "$elf" + done ''; - configureFlags = [ - "--enable-colors" - "--enable-lyrics-screen" - ]; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; }; }