staging
This commit is contained in:
parent
aecfcb0fa6
commit
751d5e996f
3 changed files with 57 additions and 5 deletions
51
flake.nix
51
flake.nix
|
|
@ -25,11 +25,58 @@
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
customPkgsOverlay = final: prev:
|
customPkgsOverlay = final: prev: let
|
||||||
import ./pkgs {
|
customPkgs = import ./pkgs {
|
||||||
pkgs = prev;
|
pkgs = prev;
|
||||||
lib = prev.lib;
|
lib = prev.lib;
|
||||||
};
|
};
|
||||||
|
in
|
||||||
|
customPkgs
|
||||||
|
// {
|
||||||
|
pugixml = prev.pugixml.overrideAttrs (oldAttrs: rec {
|
||||||
|
version = "1.15";
|
||||||
|
src = prev.fetchurl {
|
||||||
|
url = "https://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz";
|
||||||
|
sha256 = "ZVreV/pwP7QhwuuaARO1BkvdsUXUFd0fiMeTU9kNURo=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
SDL3 = prev.stdenv.mkDerivation rec {
|
||||||
|
pname = "SDL3";
|
||||||
|
version = "3.1.3";
|
||||||
|
src = prev.fetchFromGitHub {
|
||||||
|
owner = "libsdl-org";
|
||||||
|
repo = "SDL";
|
||||||
|
rev = "preview-${version}";
|
||||||
|
sha256 = "XQwcl/udA+r5HJs21K+GtZ2GIXfXUHjYTXFYW4Yx+Do=";
|
||||||
|
};
|
||||||
|
nativeBuildInputs = [prev.cmake];
|
||||||
|
buildInputs = [
|
||||||
|
prev.libGL
|
||||||
|
prev.xorg.libX11
|
||||||
|
prev.xorg.libXext
|
||||||
|
prev.alsa-lib
|
||||||
|
];
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DSDL_STATIC=OFF"
|
||||||
|
"-DSDL_SHARED=ON"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
rpcs3 = prev.rpcs3.overrideAttrs (oldAttrs: {
|
||||||
|
nativeBuildInputs =
|
||||||
|
(oldAttrs.nativeBuildInputs or [])
|
||||||
|
++ [
|
||||||
|
prev.llvmPackages_18.llvm.dev
|
||||||
|
prev.llvmPackages_18.clang
|
||||||
|
];
|
||||||
|
buildInputs =
|
||||||
|
(oldAttrs.buildInputs or [])
|
||||||
|
++ [
|
||||||
|
prev.llvmPackages_18.llvm
|
||||||
|
prev.llvmPackages_18.libclang
|
||||||
|
final.SDL3
|
||||||
|
];
|
||||||
|
});
|
||||||
|
};
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
inputs,
|
||||||
rpcs3_latest,
|
rpcs3_latest,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
|
@ -15,7 +16,7 @@
|
||||||
./modules/starship.nix
|
./modules/starship.nix
|
||||||
./modules/zellij.nix
|
./modules/zellij.nix
|
||||||
./modules/ffmpeg.nix
|
./modules/ffmpeg.nix
|
||||||
(import ./modules/emulators.nix {inherit pkgs rpcs3_latest;})
|
(import ./modules/emulators.nix {inherit pkgs inputs rpcs3_latest;})
|
||||||
];
|
];
|
||||||
|
|
||||||
home.username = "cobray";
|
home.username = "cobray";
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,12 @@
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
rpcs3_latest,
|
inputs,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
rpcs3_latest = pkgs.rpcs3.overrideAttrs (oldAttrs: {
|
||||||
|
src = inputs.rpcs3-latest;
|
||||||
|
});
|
||||||
|
in {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
mgba
|
mgba
|
||||||
desmume
|
desmume
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue