From c8799ad5bcb4db70633f28ed930bcce558b36683 Mon Sep 17 00:00:00 2001 From: Sean Link Date: Fri, 2 Feb 2024 10:46:29 -0700 Subject: [PATCH 1/2] dav1d: ran nixpkgs-fmt --- pkgs/development/libraries/dav1d/default.nix | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 9c5e5101c8af..1c8fcb6e6061 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,11 +1,20 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, nasm, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, nasm +, pkg-config , xxHash , withTools ? false # "dav1d" binary -, withExamples ? false, SDL2 # "dav1dplay" binary -, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers +, withExamples ? false +, SDL2 # "dav1dplay" binary +, useVulkan ? false +, libplacebo +, vulkan-loader +, vulkan-headers -# for passthru.tests + # for passthru.tests , ffmpeg , gdal , handbrake @@ -34,7 +43,7 @@ stdenv.mkDerivation rec { ++ lib.optional withExamples SDL2 ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; - mesonFlags= [ + mesonFlags = [ "-Denable_tools=${lib.boolToString withTools}" "-Denable_examples=${lib.boolToString withExamples}" ]; From 694844bc9a15e6304c99c2659a32f6e30973f8eb Mon Sep 17 00:00:00 2001 From: Sean Link Date: Fri, 2 Feb 2024 10:48:42 -0700 Subject: [PATCH 2/2] dav1d: add mingw support Part of a greater effort to get qtbase and qtmultimedia cross compiling for windows. - https://github.com/NixOS/nixpkgs/issues/274274 - https://github.com/NixOS/nixpkgs/issues/272538 --- pkgs/development/libraries/dav1d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 1c8fcb6e6061..670f568e0b6a 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { changelog = "https://code.videolan.org/videolan/dav1d/-/tags/${version}"; # More technical: https://code.videolan.org/videolan/dav1d/blob/${version}/NEWS license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ primeos ]; }; }