chore(nix): cleanup and update flake

This commit is contained in:
BitSyndicate 2025-04-19 00:04:17 +02:00
parent 4a674176cd
commit b1c8da6ac1
Signed by untrusted user: bitsyndicate
GPG key ID: 443E4198D6BBA6DE
2 changed files with 205 additions and 205 deletions

18
flake.lock generated
View file

@ -77,11 +77,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1743095683,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1736320768,
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
"lastModified": 1744536153,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
"type": "github"
},
"original": {
@ -138,11 +138,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1743215516,
"narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=",
"lastModified": 1744943606,
"narHash": "sha256-VL4swGy4uBcHvX+UR5pMeNE9uQzXfA7B37lkwet1EmA=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "524463199fdee49338006b049bc376b965a2cfed",
"rev": "ec22cd63500f4832d1f3432d2425e0b31b0361b1",
"type": "github"
},
"original": {

View file

@ -31,11 +31,22 @@
(import rust-overlay)
];
};
buildInputs = with pkgs; [
nativeBuildInputs = with pkgs; [
vulkan-tools
vulkan-tools-lunarg
vulkan-loader
shaderc
cargo-xbuild
cargo-pgo
cargo-cross
cargo-xwin
cargo-wizard
wine64
pkg-config
];
buildInputs = with pkgs; [
vulkan-loader
libGL
wayland
libxkbcommon
@ -44,14 +55,6 @@
xorg.libXi
xorg.libX11
xorg.libxcb
pkg-config
kdePackages.kdialog
cargo-xbuild
cargo-pgo
cargo-cross
cargo-xwin
cargo-wizard
wine64
];
in {
packages = {
@ -74,12 +77,9 @@
})
pkg-config
];
] ++ nativeBuildInputs;
buildInputs = buildInputs;
shellHook = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}"
echo "Rust version: $(rustc --version)"
'';
LD_LIBRARY_PATH= pkgs.lib.makeLibraryPath buildInputs;
};
formatter = alejandra.packages.${system}.default;
}