diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-07 01:24:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-07 01:24:09 +0100 |
commit | 944a28da8fd4fca7f3960f44cb0bbe8896d14f51 (patch) | |
tree | ed5affe95eed0751125303eed994404b0d6230cb | |
parent | 1c05e6a249a9b515a3477c81e437f5931a1d45cd (diff) | |
parent | 683293089feb2c517689525bddcf5cd237f2b751 (diff) |
Merge pull request #201379 from SuperSandro2000/mpv-unwrapped
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 73 |
1 files changed, 33 insertions, 40 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 05ec95d006bdf..11203b62df57c 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -4,11 +4,10 @@ , fetchFromGitHub , addOpenGLRunpath , docutils -, perl +, meson +, ninja , pkg-config , python3 -, wafHook -, which , ffmpeg , freefont_ttf , freetype @@ -19,6 +18,7 @@ , libuchardet , libiconv , CoreFoundation, Cocoa, CoreAudio, MediaPlayer +, xcbuild , waylandSupport ? stdenv.isLinux , wayland @@ -97,40 +97,36 @@ in stdenv.mkDerivation rec { patchShebangs version.* ./TOOLS/ ''; - NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " - + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - - # These flags are not supported and cause the build - # to fail, even when cross compilation itself works. - dontAddWafCrossFlags = true; - - wafConfigureFlags = [ - "--enable-libmpv-shared" - "--enable-manpage-build" - "--disable-libmpv-static" - "--disable-static-build" - "--disable-build-date" # Purity - (lib.enableFeature archiveSupport "libarchive") - (lib.enableFeature cddaSupport "cdda") - (lib.enableFeature dvdnavSupport "dvdnav") - (lib.enableFeature javascriptSupport "javascript") - (lib.enableFeature openalSupport "openal") - (lib.enableFeature sdl2Support "sdl2") - (lib.enableFeature sixelSupport "sixel") - (lib.enableFeature vaapiSupport "vaapi") - (lib.enableFeature waylandSupport "wayland") - (lib.enableFeature dvbinSupport "dvbin") - ] # Disable whilst Swift isn't supported - ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; + NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "; + + mesonFlags = let + mesonFeatureFlag = feature: flag: "-D${feature}=${if flag then "enabled" else "disabled"}"; + in [ + "-Ddefault_library=shared" + "-Dlibmpv=true" + (mesonFeatureFlag "libarchive" archiveSupport) + (mesonFeatureFlag "manpage-build" true) + (mesonFeatureFlag "cdda" cddaSupport) + (mesonFeatureFlag "dvbin" dvbinSupport) + (mesonFeatureFlag "dvdnav" dvdnavSupport) + (mesonFeatureFlag "openal" openalSupport) + (mesonFeatureFlag "sdl2" sdl2Support) + # Disable whilst Swift isn't supported + (mesonFeatureFlag "swift-build" swiftSupport) + (mesonFeatureFlag "macos-cocoa-cb" swiftSupport) + ]; + + mesonAutoFeatures = "auto"; nativeBuildInputs = [ addOpenGLRunpath docutils # for rst2man - perl + meson + ninja pkg-config python3 - wafHook - which + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild.xcrun ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; @@ -175,10 +171,10 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ libiconv ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; - enableParallelBuilding = true; - postBuild = lib.optionalString stdenv.isDarwin '' + pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv + popd ''; postInstall = '' @@ -186,16 +182,13 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - cp TOOLS/mpv_identify.sh $out/bin - cp TOOLS/umpv $out/bin + cp ../TOOLS/mpv_identify.sh $out/bin + cp ../TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop - - substituteInPlace $out/lib/pkgconfig/mpv.pc \ - --replace "$out/include" "$dev/include" '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r build/mpv.app $out/Applications + cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. @@ -227,6 +220,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.unix; }; } |