From 00b05d47d30fff2ca1925ec38078907b95c6cb69 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Aug 2016 12:25:01 +0200 Subject: [PATCH 1/3] ffmpeg: add extra darwin framework for 3.1 --- pkgs/development/libraries/ffmpeg/3.1.nix | 7 ++++++- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix index 25892e18684..84e6f57c523 100644 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -1,7 +1,12 @@ -{ callPackage, ... } @ args: +{ callPackage +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: callPackage ./generic.nix (args // rec { version = "${branch}.1"; branch = "3.1"; sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55"; + darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0c4e9df3df1..33ee2f80a6e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -13,7 +13,7 @@ , optimizationsDeveloper ? true , extraWarningsDeveloper ? false # Darwin frameworks -, Cocoa +, Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics , branch, sha256, version, patches ? [], ... }: @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional isLinux alsaLib - ++ optional isDarwin Cocoa + ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau ++ optional sdlSupport SDL; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a339dc08..714b68b8ed1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7172,7 +7172,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases ffmpeg_0 = self.ffmpeg_0_10; From b660ed3258f8a9e0ceb753ba41584eafc953290f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Aug 2016 17:52:01 +0200 Subject: [PATCH 2/3] 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 0f3ea26eb04..806f0e9cd82 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 714b68b8ed1..addf42c696a 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 { }; From e2fdd74a41fb8859f72e4f26636df79b046caee5 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Aug 2016 18:20:06 +0200 Subject: [PATCH 3/3] libsamplerate: fix missing darwin frameworks --- .../libraries/libsamplerate/default.nix | 23 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index f0ff549c716..771e31f7b79 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }: -stdenv.mkDerivation rec { +let + inherit (stdenv.lib) optionals optionalString; + +in stdenv.mkDerivation rec { name = "libsamplerate-0.1.8"; src = fetchurl { @@ -9,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile ]; + buildInputs = [ libsndfile ] + ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; # maybe interesting configure flags: #--disable-fftw disable usage of FFTW @@ -17,14 +21,13 @@ stdenv.mkDerivation rec { outputs = [ "dev" "bin" "out" ]; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin - '' - # need headers from the Carbon.framework in /System/Library/Frameworks to - # compile this on darwin -- not sure how to handle - NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" + postConfigure = optionalString stdenv.isDarwin '' + # need headers from the Carbon.framework in /System/Library/Frameworks to + # compile this on darwin -- not sure how to handle + NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers" - substituteInPlace examples/Makefile --replace "-fpascal-strings" "" - ''; + substituteInPlace examples/Makefile --replace "-fpascal-strings" "" + ''; meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index addf42c696a..1d2afc37c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8203,7 +8203,9 @@ in librevisa = callPackage ../development/libraries/librevisa { }; - libsamplerate = callPackage ../development/libraries/libsamplerate { }; + libsamplerate = callPackage ../development/libraries/libsamplerate { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; + }; libsieve = callPackage ../development/libraries/libsieve { };