Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

duckstation: 0.1-6292 -> 0.1-6658 #309064

Merged
merged 3 commits into from
May 29, 2024
Merged

duckstation: 0.1-6292 -> 0.1-6658 #309064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9a0966
duckstation: migrate to by-name
AndersonTorres May 22, 2024
82a6593
duckstation: checkPhase -> installCheckPhase
AndersonTorres May 22, 2024
9b1c668
duckstation: 0.1-6292 -> 0.1-6658
AndersonTorres May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s/duckstation/001-fix-test-inclusion.diff → ...u/duckstation/001-fix-test-inclusion.diff
View file
Open in desktop
File renamed without changes.
0 ...lators/duckstation/002-hardcode-vars.diff → ...ame/du/duckstation/002-hardcode-vars.diff
View file
Open in desktop
File renamed without changes.
39 changes: 26 additions & 13 deletions ...cations/emulators/duckstation/default.nix → pkgs/by-name/du/duckstation/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,42 @@
, stdenv
, fetchFromGitHub
, SDL2
, callPackage
, cmake
, cubeb
, curl
, extra-cmake-modules
, libXrandr
, libbacktrace
, libwebp
, makeWrapper
, ninja
, pkg-config
, qtbase
, qtsvg
, qttools
, qtwayland
, qt6
, substituteAll
, vulkan-loader
, wayland
, wrapQtAppsHook
}:

let
shaderc-patched = callPackage ./shaderc-patched.nix { };
doronbehar marked this conversation as resolved.
Show resolved Hide resolved
inherit (qt6)
AndersonTorres marked this conversation as resolved.
Show resolved Hide resolved
qtbase
qtsvg
qttools
qtwayland
wrapQtAppsHook
;
in
stdenv.mkDerivation (finalAttrs: {
pname = "duckstation";
version = "0.1-6292";
version = "0.1-6658";

src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
rev = "0bc42c38aab49030118f507c9783de047769148b";
hash = "sha256-8OavixSwEWihFY2fEdsepR1lqWlTH+//xZRKwb7lFCQ=";
rev = "4e0c417add264226b3db065c1466791f0591a1b5";
hash = "sha256-fN0bcjqjMmK3qVLlrYmR2VgjK0BjdK4nUj8vNYdFC3I=";
};

patches = [
Expand All @@ -40,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
src = ./002-hardcode-vars.diff;
gitHash = finalAttrs.src.rev;
gitBranch = "master";
gitTag = "${finalAttrs.version}-g0bc42c38";
gitDate = "2024-02-06T22:47:47+09:00";
gitTag = "${finalAttrs.version}-g4e0c417a";
gitDate = "2024-04-16T12:49:54+10:00";
})
];

Expand All @@ -59,9 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
curl
libXrandr
libbacktrace
libwebp
qtbase
qtsvg
qtwayland
shaderc-patched
wayland
]
++ cubeb.passthru.backendLibs;
Expand All @@ -72,10 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "BUILD_TESTS" true)
];

doCheck = true;
checkPhase = ''
doInstallCheck = true;

installCheckPhase = ''
runHook preCheck
bin/common-tests

$out/share/duckstation/common-tests

runHook postCheck
'';

Expand Down
21 changes: 21 additions & 0 deletions pkgs/by-name/du/duckstation/shaderc-patched.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
lib,
fetchpatch,
duckstation,
shaderc,
}:

shaderc.overrideAttrs (old: {
pname = "shaderc-patched-for-duckstation";
patches = (old.patches or [ ]) ++ [
(fetchpatch {
url = "file://${duckstation.src}/scripts/shaderc-changes.patch";
hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo=";
excludes = [
"CHANGES"
"CMakeLists.txt"
"libshaderc/CMakeLists.txt"
];
})
];
})
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,8 +2632,6 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa;
};

duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { };

dynamips = callPackage ../applications/emulators/dynamips { };

emu2 = callPackage ../applications/emulators/emu2 { };
Expand Down