Squash merge dev into master
This commit is contained in:
parent
a009895ea0
commit
cc87e2cb60
28 changed files with 294 additions and 256 deletions
|
|
@ -2,6 +2,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
rpcs3_latest,
|
||||
customFontPkgs,
|
||||
}: let
|
||||
rpcs3Pkgs = pkgs.callPackage ./rpcs3 {
|
||||
inherit lib rpcs3_latest;
|
||||
|
|
@ -9,4 +10,5 @@
|
|||
in {
|
||||
inherit (rpcs3Pkgs) pugixml SDL3 rpcs3 rpcs3_latest;
|
||||
fish-rust = pkgs.callPackage ./fish-rust {};
|
||||
inherit (customFontPkgs) clear-sans binary-font;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue