quick update
This commit is contained in:
parent
c96a9ec174
commit
f74f742066
5 changed files with 15 additions and 104 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -82,11 +82,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753592768,
|
"lastModified": 1755776884,
|
||||||
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
"narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
"rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -120,11 +120,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755050545,
|
"lastModified": 1755655044,
|
||||||
"narHash": "sha256-DPdNnDwDvGWn/AZ8B3G95o8EIM4/ewIfgTgR+Rlul9o=",
|
"narHash": "sha256-43fb+p7xXCIimF7r8XhrDKo3uTkeKhMbzcJ4VdUOG/M=",
|
||||||
"owner": "fufexan",
|
"owner": "fufexan",
|
||||||
"repo": "nix-gaming",
|
"repo": "nix-gaming",
|
||||||
"rev": "064757499f6d48e343552e328eb757a30fa6d17a",
|
"rev": "96cda5144e73514cd52d3e0e8b2bf116a5266b22",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -163,11 +163,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754937576,
|
"lastModified": 1755704039,
|
||||||
"narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=",
|
"narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896",
|
"rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -204,11 +204,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755020227,
|
"lastModified": 1755736253,
|
||||||
"narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=",
|
"narHash": "sha256-jlIQRypNhB1PcB1BE+expE4xZeJxzoAGr1iUbHQta8s=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "695d5db1b8b20b73292501683a524e0bd79074fb",
|
"rev": "596312aae91421d6923f18cecce934a7d3bfd6b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -26,5 +26,6 @@
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
icu
|
icu
|
||||||
libclang
|
libclang
|
||||||
|
argc
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ in {
|
||||||
|
|
||||||
config = lib.mkIf config.npm.enable {
|
config = lib.mkIf config.npm.enable {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
nodejs_23
|
nodejs_24
|
||||||
nodePackages.npm
|
nodePackages.npm
|
||||||
yarn
|
yarn
|
||||||
bun
|
bun
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
./modules/libs.nix
|
./modules/libs.nix
|
||||||
./modules/rgb.nix
|
./modules/rgb.nix
|
||||||
];
|
];
|
||||||
programs.npm.enable = true;
|
npm.enable = true;
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
|
|
||||||
|
|
@ -1,90 +0,0 @@
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
rpcs3_latest,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
pugixml = pkgs.pugixml.overrideAttrs (oldAttrs: rec {
|
|
||||||
version = "1.15";
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
url = "https://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz";
|
|
||||||
sha256 = "sha256-ZVreV/pwP7QhwuuaARO1BkvdsUXUFd0fiMeTU9kNURo=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
SDL3 = pkgs.stdenv.mkDerivation rec {
|
|
||||||
pname = "SDL3";
|
|
||||||
version = "3.1.3";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "libsdl-org";
|
|
||||||
repo = "SDL";
|
|
||||||
rev = "preview-${version}";
|
|
||||||
sha256 = "sha256-S7yRcLHMPgq6+gec8l+ESxp2dJ+6Po/UNsBUXptQzMQ=";
|
|
||||||
};
|
|
||||||
nativeBuildInputs = [pkgs.cmake];
|
|
||||||
buildInputs = [pkgs.libGL pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.alsa-lib];
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DSDL_STATIC=OFF"
|
|
||||||
"-DSDL_SHARED=ON"
|
|
||||||
"-DSDL_INSTALL_CMAKEDIR=${placeholder "out"}/lib/cmake/SDL3"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
rpcs3_latest = pkgs.rpcs3.overrideAttrs (oldAttrs: {
|
|
||||||
meta = {
|
|
||||||
maintainers = ["Cobray"];
|
|
||||||
description = "Latest build of PS3 emulator";
|
|
||||||
homepage = "https://rpcs3.net/";
|
|
||||||
license = pkgs.lib.licenses.gpl2;
|
|
||||||
};
|
|
||||||
src = pkgs.fetchgit {
|
|
||||||
url = "https://github.com/RPCS3/rpcs3.git";
|
|
||||||
rev = rpcs3_latest.rev;
|
|
||||||
sha256 = "sha256-GfPOCiF8bBGdXE9UG6jgkb4VcDAcBNqp9hqfLykIpyA=";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
|
||||||
patches = [];
|
|
||||||
nativeBuildInputs =
|
|
||||||
(oldAttrs.nativeBuildInputs or [])
|
|
||||||
++ [
|
|
||||||
pkgs.llvmPackages_19.llvm.dev
|
|
||||||
pkgs.llvmPackages_19.clang
|
|
||||||
pkgs.pkg-config
|
|
||||||
pkgs.qt6.qmake
|
|
||||||
pkgs.qt6.full
|
|
||||||
pkgs.xxd
|
|
||||||
pkgs.wayland-scanner
|
|
||||||
];
|
|
||||||
buildInputs =
|
|
||||||
(oldAttrs.buildInputs or [])
|
|
||||||
++ [
|
|
||||||
pkgs.llvmPackages_19.llvm
|
|
||||||
pkgs.llvmPackages_19.libclang
|
|
||||||
pkgs.qt6.full
|
|
||||||
pkgs.vulkan-loader
|
|
||||||
pkgs.vulkan-tools
|
|
||||||
pkgs.wayland
|
|
||||||
pkgs.wayland-protocols
|
|
||||||
pkgs.libxkbcommon
|
|
||||||
pkgs.libpulseaudio
|
|
||||||
pkgs.libevdev
|
|
||||||
pkgs.udev
|
|
||||||
pkgs.glew
|
|
||||||
pkgs.libpng
|
|
||||||
pkgs.zstd
|
|
||||||
];
|
|
||||||
cmakeFlags =
|
|
||||||
(oldAttrs.cmakeFlags or [])
|
|
||||||
++ [
|
|
||||||
"-DCMAKE_PREFIX_PATH=${pkgs.qt6.full}:${pkgs.wayland}"
|
|
||||||
"-DUSE_SYSTEM_FFMPEG=ON"
|
|
||||||
"-DUSE_SYSTEM_CURL=ON"
|
|
||||||
"-DUSE_SYSTEM_WOLFSSL=ON"
|
|
||||||
"-DUSE_QT=ON"
|
|
||||||
"-DUSE_VULKAN=ON"
|
|
||||||
"-DUSE_WAYLAND=ON"
|
|
||||||
"-DUSE_PULSEAUDIO=ON"
|
|
||||||
"-DUSE_LIBEVDEV=ON"
|
|
||||||
"-DUSE_SYSTEM_ZSTD=ON"
|
|
||||||
"-DUSE_DISCORD_RPC=ON"
|
|
||||||
"-DUSE_SDL=OFF"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue