colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35419 from Kaali/master

Browse Source 
Support mopidy on Darwin
This commit is contained in:
Daiderd Jordan 2018-03-01 22:07:28 +01:00 committed by GitHub
commit 0feffd2232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/mopidy/default.nix
View File

@ -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;

5
pkgs/development/libraries/glib-networking/default.nix
View File

@ -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)

12
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -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";

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -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;