diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-03-01 22:07:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-01 22:07:28 +0100 |
commit | 0feffd223200ca415ee58d73b40597d656b2040b (patch) | |
tree | 2984488d1b709b8776e7668a6bf6c9d49233fa6b | |
parent | 6d685a5b0fe870ddb68678a7c064362bba5ceb05 (diff) | |
parent | 5291c2079b6241f7b18c04e9af6fe6d49ef948bf (diff) | |
download | nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.tar nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.tar.gz nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.tar.bz2 nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.tar.lz nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.tar.xz nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.tar.zst nixpkgs-0feffd223200ca415ee58d73b40597d656b2040b.zip |
Merge pull request #35419 from Kaali/master
Support mopidy on Darwin
4 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 0018f17cac0..ad280d382d0 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -22,8 +22,8 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests dbus-python - ]; + gst-python pygobject3 pykka tornado requests + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests doCheck = false; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 37de039544b..1c4abe46f51 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = if stdenv.isDarwin then "--without-ca-certificates" + else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + + LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; preBuild = '' sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c033140d8dc..69ade889919 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -35,9 +35,13 @@ stdenv.mkDerivation rec { a real live maintainer, or some actual wide use. ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; + # TODO: Fix Cocoa build. The problem was ARC, which might be related to too + # old version of Apple SDK's. + configureFlags = optional stdenv.isDarwin "--disable-cocoa"; + patchPhase = '' sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* ''; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls mesa - mjpegtools libgme openssl x265 libxml2 + libgme openssl x265 libxml2 ] ++ libintlOrEmpty ++ optional faacSupport faac @@ -67,7 +71,9 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - ++ optional (!stdenv.isDarwin) wildmidi; + ++ optional (!stdenv.isDarwin) wildmidi + # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin + ++ optional (!stdenv.isDarwin) mjpegtools; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 3aa8eb886d7..cdaa88ce350 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python , gst-plugins-base, orc , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty +, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc a52dec libcdio libdvdread - lame libmad libmpeg2 x264 + lame libmad libmpeg2 x264 mpg123 ] ++ libintlOrEmpty; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; |