diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-14 12:21:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 12:21:24 +0000 |
| commit | c46d15de44f9544994e2887e84e260ce66a86565 (patch) | |
| tree | 45f399388fba16834011dfdc05f18ef8ca18f617 | |
| parent | 717c53e52fd063c0a9c35c86741688d21ce09497 (diff) | |
| parent | 3510e233dcd7d8377c1cb2cb621eacbd209e6b81 (diff) | |
| download | nixlib-c46d15de44f9544994e2887e84e260ce66a86565.tar nixlib-c46d15de44f9544994e2887e84e260ce66a86565.tar.gz nixlib-c46d15de44f9544994e2887e84e260ce66a86565.tar.bz2 nixlib-c46d15de44f9544994e2887e84e260ce66a86565.tar.lz nixlib-c46d15de44f9544994e2887e84e260ce66a86565.tar.xz nixlib-c46d15de44f9544994e2887e84e260ce66a86565.tar.zst nixlib-c46d15de44f9544994e2887e84e260ce66a86565.zip | |
Merge pull request #73379 from marsam/fix-mpv-darwin
mpv: fix build on darwin
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/sndio/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 78e0544fa1d1..f3c7d3761004 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,7 +39,7 @@ , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null , screenSaverSupport ? true, libXScrnSaver ? null -, sambaSupport ? true, samba ? null +, sambaSupport ? stdenv.isLinux, samba ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null , speexSupport ? true, speex ? null diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 0f09483a8571..c415714f573c 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib for file in $out/bin/*; do install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file done |