diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-09 12:57:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 12:57:48 +0200 |
| commit | 42f7345fb06a55ee9f10fb8780818374b5d5117f (patch) | |
| tree | 19d7d27f2aa9af4a6c739725bc4c8d31415fdf50 /pkgs | |
| parent | 3720503cdf7197c304cf66b2f241631365c324db (diff) | |
| parent | c856e2c30601caa5eca85d8b591af16c04191eeb (diff) | |
Merge pull request #194910 from SuperSamus/duckstation-revert
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/emulators/duckstation/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 7936ced720f0a..d02e08ed6cd40 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -7,28 +7,28 @@ , makeDesktopItem , curl , extra-cmake-modules +, libevdev , libpulseaudio , libXrandr , mesa # for libgbm , ninja , pkg-config , qtbase -, qtsvg , qttools , vulkan-loader -, wayland +#, wayland # Wayland doesn't work correctly this version , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "duckstation"; - version = "unstable-2022-08-22"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "4f2da4213d1d2c69417392d15b27bb123ee9d297"; - sha256 = "sha256-VJeKbJ40ZErlu/6RETvk0KDSc9T7ssBrLDecNczQlXU="; + rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; + sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; }; nativeBuildInputs = [ @@ -44,30 +44,31 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 curl + libevdev libpulseaudio libXrandr mesa qtbase - qtsvg vulkan-loader - wayland + #wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" + #"-DUSE_WAYLAND=ON" ]; desktopItems = [ (makeDesktopItem { - name = "DuckStation"; - desktopName = "JamesDSP"; + name = "duckstation-qt"; + desktopName = "DuckStation"; genericName = "PlayStation 1 Emulator"; icon = "duckstation"; tryExec = "duckstation-qt"; exec = "duckstation-qt %f"; comment = "Fast PlayStation 1 emulator"; categories = [ "Game" "Emulator" "Qt" ]; + type = "Application"; }) ]; @@ -79,7 +80,7 @@ stdenv.mkDerivation rec { cp -r bin $out/share/duckstation 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 ''; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ + "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21a698ad40903..ff4e791abbb15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1500,7 +1500,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; dynamips = callPackage ../applications/emulators/dynamips { }; |