cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

duckstation: unstable-2022-08-22 -> unstable-2022-07-08

Browse source 
This reverts commit b6298548da, reversing
changes made to c82e839d2d.

duckstation: 0.pre+date=2022-01-18 -> unstable-2022-07-08
This commit is contained in:
Martino Fontana 2022-10-07 11:42:21 +02:00
parent e16d04eda7
commit c856e2c306
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/applications/emulators/duckstation/default.nix
View file

@ -7,28 +7,28 @@
, makeDesktopItem , makeDesktopItem
, curl , curl
, extra-cmake-modules , extra-cmake-modules
, libevdev
, libpulseaudio , libpulseaudio
, libXrandr , libXrandr
, mesa # for libgbm , mesa # for libgbm
, ninja , ninja
, pkg-config , pkg-config
, qtbase , qtbase
, qtsvg
, qttools , qttools
, vulkan-loader , vulkan-loader
, wayland #, wayland # Wayland doesn't work correctly this version
, wrapQtAppsHook , wrapQtAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "duckstation"; pname = "duckstation";
version = "unstable-2022-08-22"; version = "unstable-2022-07-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stenzek"; owner = "stenzek";
repo = pname; repo = pname;
rev = "4f2da4213d1d2c69417392d15b27bb123ee9d297"; rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f";
sha256 = "sha256-VJeKbJ40ZErlu/6RETvk0KDSc9T7ssBrLDecNczQlXU="; sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,30 +44,31 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
SDL2 SDL2
curl curl
libevdev
libpulseaudio libpulseaudio
libXrandr libXrandr
mesa mesa
qtbase qtbase
qtsvg
vulkan-loader vulkan-loader
wayland #wayland
]; ];
cmakeFlags = [ cmakeFlags = [
"-DUSE_DRMKMS=ON" "-DUSE_DRMKMS=ON"
"-DUSE_WAYLAND=ON" #"-DUSE_WAYLAND=ON"
]; ];
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = "DuckStation"; name = "duckstation-qt";
desktopName = "JamesDSP"; desktopName = "DuckStation";
genericName = "PlayStation 1 Emulator"; genericName = "PlayStation 1 Emulator";
icon = "duckstation"; icon = "duckstation";
tryExec = "duckstation-qt"; tryExec = "duckstation-qt";
exec = "duckstation-qt %f"; exec = "duckstation-qt %f";
comment = "Fast PlayStation 1 emulator"; comment = "Fast PlayStation 1 emulator";
categories = [ "Game" "Emulator" "Qt" ]; categories = [ "Game" "Emulator" "Qt" ];
type = "Application";
}) })
]; ];
@ -79,7 +80,7 @@ stdenv.mkDerivation rec {
cp -r bin $out/share/duckstation cp -r bin $out/share/duckstation
ln -s $out/share/duckstation/duckstation-qt $out/bin/ ln -s $out/share/duckstation/duckstation-qt $out/bin/
install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png
runHook postInstall runHook postInstall
''; '';
@ -93,6 +94,7 @@ stdenv.mkDerivation rec {
# Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173
qtWrapperArgs = [ qtWrapperArgs = [
"--set QT_QPA_PLATFORM xcb"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
]; ];

2
pkgs/top-level/all-packages.nix
View file

@ -1494,7 +1494,7 @@ with pkgs;
dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { };
duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {};
dynamips = callPackage ../applications/emulators/dynamips { }; dynamips = callPackage ../applications/emulators/dynamips { };