From b660ed3258f8a9e0ceb753ba41584eafc953290f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Aug 2016 17:52:01 +0200 Subject: [PATCH] libmikmod: fix missing darwin framework --- pkgs/development/libraries/libmikmod/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 0f3ea26eb043..806f0e9cd824 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }: +{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: -stdenv.mkDerivation rec { +let + inherit (stdenv.lib) optional optionals optionalString; + +in stdenv.mkDerivation rec { name = "libmikmod-3.3.7"; src = fetchurl { url = "mirror://sourceforge/mikmod/${name}.tar.gz"; @@ -8,11 +11,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ]; + ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ] + ++ optional stdenv.isDarwin CoreAudio; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux libpulseaudio; + optional stdenv.isLinux libpulseaudio; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound"; + NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound"; meta = with stdenv.lib; { description = "A library for playing tracker music module files"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 714b68b8ed17..addf42c696a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8292,7 +8292,9 @@ in libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; - libmikmod = callPackage ../development/libraries/libmikmod { }; + libmikmod = callPackage ../development/libraries/libmikmod { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; libmilter = callPackage ../development/libraries/libmilter { };