From 900357f355336cec12fe4138ea58599d667e4bbf Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Mon, 9 Jan 2023 15:15:32 +0100
Subject: [PATCH] duckstation: unstable-2022-12-08 -> unstable-2023-01-01
---
.../emulators/duckstation/default.nix | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix
index fffbb3ac9326..0f48dd71e6c4 100644
--- a/pkgs/applications/emulators/duckstation/default.nix
+++ b/pkgs/applications/emulators/duckstation/default.nix
@@ -15,6 +15,7 @@
, qtbase
, qtsvg
, qttools
+, qtwayland
, vulkan-loader
, wayland
, wrapQtAppsHook
@@ -23,23 +24,25 @@
stdenv.mkDerivation {
pname = "duckstation";
- version = "unstable-2022-12-08";
+ version = "unstable-2023-01-01";
src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
- rev = "1905ce3e0163fd53e56cc949379f74a2e1c6228d";
- sha256 = "sha256-q6r9VCGwYCTzyZ3s1BAhQiA8FKsue7QUcErGtuLJbCg=";
+ rev = "06d6447e59f208f21ba42f4df1665b789db13fb7";
+ sha256 = "sha256-DyuQ7J7MVSQHpvPZhMtwqNM8ifjI8UFYQ9SxY5kikBI=";
};
nativeBuildInputs = [
cmake
- extra-cmake-modules
copyDesktopItems
ninja
pkg-config
qttools
wrapQtAppsHook
+ ]
+ ++ lib.optionals enableWayland [
+ extra-cmake-modules
];
buildInputs = [
@@ -52,7 +55,10 @@ stdenv.mkDerivation {
qtsvg
vulkan-loader
]
- ++ lib.optionals enableWayland [ wayland ];
+ ++ lib.optionals enableWayland [
+ qtwayland
+ wayland
+ ];
cmakeFlags = [
"-DUSE_DRMKMS=ON"
@@ -93,9 +99,7 @@ stdenv.mkDerivation {
runHook postCheck
'';
- # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173
qtWrapperArgs = [
- "--set QT_QPA_PLATFORM xcb"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
];