From 6821ff041ac691bd2afd97d4ebef0392b723b937 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Wed, 7 Dec 2022 22:39:48 +0100 Subject: mpv: inline lib --- pkgs/applications/video/mpv/default.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 88204a47365a2..71fd52f35d885 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -99,21 +99,19 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "; - mesonFlags = let - inherit (lib) mesonOption mesonBool mesonEnable; - in [ - (mesonOption "default_library" "shared") - (mesonBool "libmpv" true) - (mesonEnable "libarchive" archiveSupport) - (mesonEnable "manpage-build" true) - (mesonEnable "cdda" cddaSupport) - (mesonEnable "dvbin" dvbinSupport) - (mesonEnable "dvdnav" dvdnavSupport) - (mesonEnable "openal" openalSupport) - (mesonEnable "sdl2" sdl2Support) + mesonFlags = [ + (lib.mesonOption "default_library" "shared") + (lib.mesonBool "libmpv" true) + (lib.mesonEnable "libarchive" archiveSupport) + (lib.mesonEnable "manpage-build" true) + (lib.mesonEnable "cdda" cddaSupport) + (lib.mesonEnable "dvbin" dvbinSupport) + (lib.mesonEnable "dvdnav" dvdnavSupport) + (lib.mesonEnable "openal" openalSupport) + (lib.mesonEnable "sdl2" sdl2Support) # Disable whilst Swift isn't supported - (mesonEnable "swift-build" swiftSupport) - (mesonEnable "macos-cocoa-cb" swiftSupport) + (lib.mesonEnable "swift-build" swiftSupport) + (lib.mesonEnable "macos-cocoa-cb" swiftSupport) ]; mesonAutoFeatures = "auto"; -- cgit 1.4.1