Compare commits

...

5 commits

9 changed files with 60 additions and 257 deletions

90
flake.lock generated
View file

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1736955230,
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
"lastModified": 1745630506,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
"owner": "ryantm",
"repo": "agenix",
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
"type": "github"
},
"original": {
@ -28,11 +28,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1745571143,
"narHash": "sha256-BndQEgBtQh6kPC+2PYdf9iWTSmrbaPjTFkVei2OtuKk=",
"lastModified": 1747268376,
"narHash": "sha256-JDcdINnB1bfbUAy1eEgwIXLrfZeuntxuxTu7UWcQrQY=",
"owner": "catppuccin",
"repo": "nix",
"rev": "19919d666ead54e97f7886813db08f76ae0981dc",
"rev": "7a6ccdeba6e761bec9601e2192983e6b9dff630c",
"type": "github"
},
"original": {
@ -147,11 +147,11 @@
]
},
"locked": {
"lastModified": 1703113217,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"lastModified": 1745494811,
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
"type": "github"
},
"original": {
@ -167,11 +167,11 @@
]
},
"locked": {
"lastModified": 1745555634,
"narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=",
"lastModified": 1747279714,
"narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "98f4fef7fd7b4a77245db12e33616023162bc6d9",
"rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
"type": "github"
},
"original": {
@ -187,11 +187,11 @@
]
},
"locked": {
"lastModified": 1745557122,
"narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
"lastModified": 1747020534,
"narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
"rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
"type": "github"
},
"original": {
@ -209,11 +209,11 @@
]
},
"locked": {
"lastModified": 1745487384,
"narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=",
"lastModified": 1747221863,
"narHash": "sha256-2sHoet8Dj16i6fiwlZh9r5Hs9mRIInKvewk8JjU91KQ=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148",
"rev": "e6189e1e6e019dea8c0ee4f7eba2a435b232e294",
"type": "github"
},
"original": {
@ -225,11 +225,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1745521626,
"narHash": "sha256-+7DQIKTkvpWYz8bjYfye9T61C5QAUKPEy1YCsXUDCkE=",
"rev": "a133633ecc4ca3aed65899cb37c17601c95f5b2b",
"lastModified": 1747273354,
"narHash": "sha256-LUzJQ0T6XtlZLuFZ9ovLLCdzaCc4YhotPlMLoMcGD5w=",
"rev": "b7ce00fc55dea4fa1e282921beebff25e6b2d1f0",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a133633ecc4ca3aed65899cb37c17601c95f5b2b.tar.gz?rev=a133633ecc4ca3aed65899cb37c17601c95f5b2b"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b7ce00fc55dea4fa1e282921beebff25e6b2d1f0.tar.gz?rev=b7ce00fc55dea4fa1e282921beebff25e6b2d1f0"
},
"original": {
"type": "tarball",
@ -248,11 +248,11 @@
]
},
"locked": {
"lastModified": 1742945498,
"narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
"rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
"lastModified": 1746839253,
"narHash": "sha256-pRwi8Wn8Yofj459gq+3oIRy8F3SXeEJ6mzfIAUgM9nA=",
"rev": "58baedd53f9da81fd728a4f3b08c378e5ba9ae58",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/58baedd53f9da81fd728a4f3b08c378e5ba9ae58.tar.gz?rev=58baedd53f9da81fd728a4f3b08c378e5ba9ae58"
},
"original": {
"type": "tarball",
@ -271,11 +271,11 @@
]
},
"locked": {
"lastModified": 1742945498,
"narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
"rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
"lastModified": 1746839253,
"narHash": "sha256-pRwi8Wn8Yofj459gq+3oIRy8F3SXeEJ6mzfIAUgM9nA=",
"rev": "58baedd53f9da81fd728a4f3b08c378e5ba9ae58",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/58baedd53f9da81fd728a4f3b08c378e5ba9ae58.tar.gz?rev=58baedd53f9da81fd728a4f3b08c378e5ba9ae58"
},
"original": {
"type": "tarball",
@ -342,11 +342,11 @@
]
},
"locked": {
"lastModified": 1745120797,
"narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=",
"lastModified": 1746934494,
"narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "69716041f881a2af935021c1182ed5b0cc04d40e",
"rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff",
"type": "github"
},
"original": {
@ -362,11 +362,11 @@
]
},
"locked": {
"lastModified": 1745120797,
"narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=",
"lastModified": 1746934494,
"narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "69716041f881a2af935021c1182ed5b0cc04d40e",
"rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff",
"type": "github"
},
"original": {
@ -377,11 +377,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1745503349,
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
"lastModified": 1747129300,
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
"rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github"
},
"original": {
@ -409,11 +409,11 @@
},
"nixpkgs-raw": {
"locked": {
"lastModified": 1745487689,
"narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
"lastModified": 1747209494,
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
"rev": "5d736263df906c5da72ab0f372427814de2f52f8",
"type": "github"
},
"original": {
@ -424,11 +424,11 @@
},
"nixpkgs-unstable-raw": {
"locked": {
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"lastModified": 1747179050,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github"
},
"original": {

View file

@ -97,8 +97,6 @@
name = "patched-nixpkgs-unstable";
src = nixpkgs-unstable-raw;
patches = [
./nixpkgs-patches/pr400900.patch
./nixpkgs-patches/pr386360.patch
];
};
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {

View file

@ -1,71 +0,0 @@
From ec004ef5f30f4ea66ce0b77bab5ce778883aff5d Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Tue, 1 Apr 2025 20:23:42 +0900
Subject: [PATCH] rpcs3: 0.0.34-17323-92d070729 -> 0.0.36-17736-c86a25079
---
pkgs/by-name/rp/rpcs3/package.nix | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 779d9048ca0ea0..dc39a9bc61e384 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -21,12 +21,14 @@
python3,
pugixml,
flatbuffers,
- llvm_16,
+ llvm_18,
cubeb,
+ opencv,
enableDiscordRpc ? false,
faudioSupport ? true,
faudio,
SDL2,
+ sdl3,
waylandSupport ? true,
wayland,
wrapGAppsHook3,
@@ -34,10 +36,10 @@
let
# Keep these separate so the update script can regex them
- rpcs3GitVersion = "17323-92d070729";
- rpcs3Version = "0.0.34-17323-92d070729";
- rpcs3Revision = "92d07072915b99917892dd7833c06eb44a09e234";
- rpcs3Hash = "sha256-GH2sXw1AYdqwzxucXFhVS0nM0eRhC+XDHS6RTZY8pYY=";
+ rpcs3GitVersion = "17736-c86a25079";
+ rpcs3Version = "0.0.36-17736-c86a25079";
+ rpcs3Revision = "c86a25079518032d73395a79979970acb2581a91";
+ rpcs3Hash = "sha256-e+mT3qn1oz1fh2bqu5YM+m774Can34If57Kd1T1EGbk=";
inherit (qt6Packages)
qtbase
@@ -77,9 +79,11 @@ stdenv.mkDerivation {
(lib.cmakeBool "USE_SYSTEM_CURL" true)
(lib.cmakeBool "USE_SYSTEM_WOLFSSL" true)
(lib.cmakeBool "USE_SYSTEM_FAUDIO" true)
+ (lib.cmakeBool "USE_SYSTEM_OPENAL" true)
(lib.cmakeBool "USE_SYSTEM_PUGIXML" true)
(lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true)
(lib.cmakeBool "USE_SYSTEM_SDL" true)
+ (lib.cmakeBool "USE_SYSTEM_OPENCV" true)
(lib.cmakeBool "USE_SDL" true)
(lib.cmakeBool "WITH_LLVM" true)
(lib.cmakeBool "BUILD_LLVM" false)
@@ -115,10 +119,12 @@ stdenv.mkDerivation {
wolfssl
python3
pugixml
- SDL2
+ SDL2 # Still needed by FAudio's CMake
+ sdl3
flatbuffers
- llvm_16
+ llvm_18
libSM
+ opencv
]
++ cubeb.passthru.backendLibs
++ lib.optional faudioSupport faudio

View file

@ -1,101 +0,0 @@
From 66e2bdbc88f1985c0960c29e991ffcbb8b180cc0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 22 Apr 2025 20:04:11 +0200
Subject: [PATCH] rpcs3: unbreak
---
.../rp/rpcs3/fix-qt6.9-compilation.patch | 68 +++++++++++++++++++
pkgs/by-name/rp/rpcs3/package.nix | 5 ++
2 files changed, 73 insertions(+)
create mode 100644 pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch
diff --git a/pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch b/pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch
new file mode 100644
index 00000000000000..13ca314d3022ba
--- /dev/null
+++ b/pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch
@@ -0,0 +1,68 @@
+From 600e4604169464c64cbf548e7629e483ad2aad1e Mon Sep 17 00:00:00 2001
+From: Megamouse <studienricky89@googlemail.com>
+Date: Mon, 7 Apr 2025 20:49:15 +0200
+Subject: [PATCH] Fix compilation with newer Qt
+
+---
+ rpcs3/rpcs3qt/game_list_base.cpp | 2 +-
+ rpcs3/rpcs3qt/game_list_frame.cpp | 4 ++--
+ rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp
+index 72b45d33bfbb..21640906ee7e 100644
+--- a/rpcs3/rpcs3qt/game_list_base.cpp
++++ b/rpcs3/rpcs3qt/game_list_base.cpp
+@@ -25,7 +25,7 @@ void game_list_base::repaint_icons(std::vector<game_info>& game_data, const QCol
+ for (game_info& game : game_data)
+ {
+ game->pxmap = placeholder;
+-
++
+ if (movie_item_base* item = game->item)
+ {
+ item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int)
+diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
+index a294d69cc68e..439913760053 100644
+--- a/rpcs3/rpcs3qt/game_list_frame.cpp
++++ b/rpcs3/rpcs3qt/game_list_frame.cpp
+@@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set
+
+ connect(future_watcher, &QFutureWatcher<void>::finished, this, [=, this]()
+ {
+- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size));
++ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
+ pdlg->setCancelButtonText(tr("OK"));
+ QApplication::beep();
+
+@@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set
+ return;
+ }
+
+- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size));
++ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
+ pdlg->setCancelButtonText(tr("OK"));
+ connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); });
+ QApplication::beep();
+diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
+index 45fbe6f59e7d..4b9bc5dd6e4f 100644
+--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
++++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
+@@ -362,7 +362,7 @@ void ps_move_tracker_dialog::update_saturation_threshold(bool update_slider)
+ }
+ void ps_move_tracker_dialog::update_min_radius(bool update_slider)
+ {
+- ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius));
++ ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get()));
+
+ if (update_slider)
+ {
+@@ -372,7 +372,7 @@ void ps_move_tracker_dialog::update_min_radius(bool update_slider)
+
+ void ps_move_tracker_dialog::update_max_radius(bool update_slider)
+ {
+- ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius));
++ ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get()));
+
+ if (update_slider)
+ {
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 779d9048ca0ea0..b633453a77e61d 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -58,6 +58,11 @@ stdenv.mkDerivation {
hash = rpcs3Hash;
};
+ patches = [
+ # Modified from https://github.com/RPCS3/rpcs3/pull/17009; doesn't apply cleanly due to intermediate commits
+ ./fix-qt6.9-compilation.patch
+ ];
+
passthru.updateScript = ./update.sh;
preConfigure = ''

View file

@ -64,7 +64,7 @@ in {
* @invite r6Mdz5dpFc
* **/
@import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css");
@import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha-mauve.theme.css");
'';
};
};

View file

@ -1,18 +1,7 @@
{
pkgs,
lib,
...
}: {
{pkgs, ...}: {
home-manager.users.toast = {
programs.git = {
package = pkgs.gitFull;
extraConfig = {
cola = {
icontheme = lib.mkDefault "dark";
};
};
};
home.packages = [pkgs.git-cola];
};
}

View file

@ -1,17 +1,17 @@
{pkgs, ...}: {
nixpkgs.overlays = [
(
final: prev: {
azahar = prev.azahar.overrideAttrs (old: {
version = "2120.3";
src = final.fetchzip {
url = "https://github.com/azahar-emu/azahar/releases/download/2120.3/azahar-unified-source-20250414-00e3bbb.tar.xz";
hash = "sha256-3QKicmpmWDM7x9GDJ8sxm2Xu+0Yfho4LkSWMp+ixzRk=";
};
});
}
)
];
# nixpkgs.overlays = [
# (
# final: prev: {
# azahar = prev.azahar.overrideAttrs (old: {
# version = "2120.3";
# src = final.fetchzip {
# url = "https://github.com/azahar-emu/azahar/releases/download/2120.3/azahar-unified-source-20250414-00e3bbb.tar.xz";
# hash = "sha256-3QKicmpmWDM7x9GDJ8sxm2Xu+0Yfho4LkSWMp+ixzRk=";
# };
# });
# }
# )
# ];
home-manager.users.toast = {
home.packages = [pkgs.azahar];
};

View file

@ -6,7 +6,6 @@
# Neochat depends on olm which is unsafe now
# ./neochat.nix
./konsole.nix
./git.nix
./kwin.nix
./baloo.nix
];

View file

@ -1,11 +0,0 @@
{...}: {
home-manager.users.toast = {
programs.git = {
extraConfig = {
cola = {
terminal = "konsole";
};
};
};
};
}