lol

Merge pull request #35419 from Kaali/master

Support mopidy on Darwin

authored by

Daiderd Jordan and committed by
GitHub
0feffd22 6d685a5b

+17 -8
+2 -2
pkgs/applications/audio/mopidy/default.nix
··· 22 22 ]; 23 23 24 24 propagatedBuildInputs = with pythonPackages; [ 25 - gst-python pygobject3 pykka tornado requests dbus-python 26 - ]; 25 + gst-python pygobject3 pykka tornado requests 26 + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; 27 27 28 28 # There are no tests 29 29 doCheck = false;
+4 -1
pkgs/development/libraries/glib-networking/default.nix
··· 15 15 16 16 outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs 17 17 18 - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; 18 + configureFlags = if stdenv.isDarwin then "--without-ca-certificates" 19 + else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; 20 + 21 + LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; 19 22 20 23 preBuild = '' 21 24 sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
+9 -3
pkgs/development/libraries/gstreamer/bad/default.nix
··· 35 35 a real live maintainer, or some actual wide use. 36 36 ''; 37 37 license = licenses.lgpl2Plus; 38 - platforms = platforms.linux; 38 + platforms = platforms.linux ++ platforms.darwin; 39 39 }; 40 + 41 + # TODO: Fix Cocoa build. The problem was ARC, which might be related to too 42 + # old version of Apple SDK's. 43 + configureFlags = optional stdenv.isDarwin "--disable-cocoa"; 40 44 41 45 patchPhase = '' 42 46 sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* ··· 58 62 openjpeg libopus librsvg 59 63 fluidsynth libvdpau 60 64 libwebp xvidcore gnutls mesa 61 - mjpegtools libgme openssl x265 libxml2 65 + libgme openssl x265 libxml2 62 66 ] 63 67 ++ libintlOrEmpty 64 68 ++ optional faacSupport faac ··· 67 71 ++ optional stdenv.isLinux wayland 68 72 # wildmidi requires apple's OpenAL 69 73 # TODO: package apple's OpenAL, fix wildmidi, include on Darwin 70 - ++ optional (!stdenv.isDarwin) wildmidi; 74 + ++ optional (!stdenv.isDarwin) wildmidi 75 + # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin 76 + ++ optional (!stdenv.isDarwin) mjpegtools; 71 77 72 78 LDFLAGS = optionalString stdenv.isDarwin "-lintl"; 73 79
+2 -2
pkgs/development/libraries/gstreamer/ugly/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, python 2 2 , gst-plugins-base, orc 3 3 , a52dec, libcdio, libdvdread 4 - , lame, libmad, libmpeg2, x264, libintlOrEmpty 4 + , lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { ··· 32 32 buildInputs = [ 33 33 gst-plugins-base orc 34 34 a52dec libcdio libdvdread 35 - lame libmad libmpeg2 x264 35 + lame libmad libmpeg2 x264 mpg123 36 36 ] ++ libintlOrEmpty; 37 37 38 38 NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;