diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-02 00:34:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 00:34:21 +0100 |
| commit | fa56fc4be069881d24e7b05729121accfa1ed832 (patch) | |
| tree | 354167b65513661ed799c2d9408503655449ea14 /pkgs | |
| parent | 583af89fc003b0f65971c696596b5d69f430c5eb (diff) | |
| parent | dccd8a2685ba73b443ea20a6101e24fc6fc9b000 (diff) | |
| download | nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.tar nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.tar.gz nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.tar.bz2 nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.tar.lz nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.tar.xz nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.tar.zst nixlib-fa56fc4be069881d24e7b05729121accfa1ed832.zip | |
Merge pull request #34445 from vbgl/mpd_clientlib-darwin
mpd_clientlib, ncmpc: fix on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/ncmpc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mpd/clientlib.nix | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 1b865642178f..93e909fc604b 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 269b20dbebba..dab63a5bad83 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "2.13"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq"; }; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; |