From bef8f555952a334c271f96de3d6c1e15a153c845 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 24 Jan 2024 16:49:05 -0600 Subject: chiaki4deck: 1.5.1 -> 1.6.4 --- pkgs/games/chiaki4deck/default.nix | 40 ++++++++++++++++++++++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix index fcb2ed831fb7..1edde87068bd 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki4deck/default.nix @@ -1,38 +1,52 @@ { lib , fetchFromGitHub -, mkDerivation +, fetchpatch +, stdenv , cmake , pkg-config , protobuf , python3 , ffmpeg_6 , libopus +, wrapQtAppsHook , qtbase , qtmultimedia , qtsvg +, qtwayland +, qtdeclarative +, qtwebengine , SDL2 , libevdev , udev , hidapi , fftw , speexdsp +, libplacebo +, vulkan-loader +, vulkan-headers +, libunwind +, shaderc +, lcms2 +, libdovi +, xxHash }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "chiaki4deck"; - version = "1.5.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-XNpD9JPbckiq0HgpV/QJR8hDmvGTptxBMoGihHz44lc="; + hash = "sha256-x//E3HgS9NHQW7IHEJYWnAnfw2umcktcL0/28BPh1PY="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config + wrapQtAppsHook protobuf python3 python3.pkgs.wrapPython @@ -46,6 +60,9 @@ mkDerivation rec { qtbase qtmultimedia qtsvg + qtdeclarative + qtwayland + qtwebengine protobuf SDL2 hidapi @@ -53,6 +70,21 @@ mkDerivation rec { libevdev udev speexdsp + libplacebo + vulkan-headers + libunwind + shaderc + lcms2 + libdovi + xxHash + ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" ]; pythonPath = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6edde48394..6cacadd408f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37061,7 +37061,7 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki4deck = libsForQt5.callPackage ../games/chiaki4deck { }; + chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { }; chromium-bsu = callPackage ../games/chromium-bsu { }; -- cgit 1.4.1