diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-29 01:36:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-29 01:36:12 +0100 |
commit | 6c056bed3a723631798153c516b0d4a176396b2e (patch) | |
tree | ea90459e44958f9e5f4b93f5d5f328d02800437b /pkgs/applications | |
parent | 7bc51003411d4aebc8b543b2f84da6a0eefa3789 (diff) | |
parent | 5e3e81f6048239c821e7663a2371d4cd018b1ef1 (diff) |
Merge pull request #205046 from SuperSandro2000/lib-meson
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/wbg/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 26 |
2 files changed, 14 insertions, 22 deletions
diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/applications/misc/wbg/default.nix index 0febd846e024b..d5f95961f37ef 100644 --- a/pkgs/applications/misc/wbg/default.nix +++ b/pkgs/applications/misc/wbg/default.nix @@ -16,12 +16,6 @@ , libjpeg }: -let - # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; -in - stdenv.mkDerivation rec { pname = "wbg"; version = "1.0.2"; @@ -52,8 +46,8 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; mesonFlags = [ - (mesonFeatureFlag "png" enablePNG) - (mesonFeatureFlag "jpeg" enableJPEG) + (lib.mesonEnable "png" enablePNG) + (lib.mesonEnable "jpeg" enableJPEG) ]; meta = with lib; { 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"; |