christoph/bevy-antsim
1
Fork 0
Code Activity

Don't use devshell in flake for it breaks pkg-config

Browse Source
This commit is contained in:
Christoph Urlacher
2024-10-05 15:40:34 +02:00
parent 10ea59059e
commit 3469aae86e
2 changed files with 10 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
flake.lock generated
View File

@ -1,23 +1,5 @@
{ {
"nodes": { "nodes": {
"devshell": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -37,22 +19,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1722073938,
"narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728031656, "lastModified": 1728031656,
"narHash": "sha256-JXumn7X+suKEcehp4rchSvBzIboqyybQ5bLK4wk7gQU=", "narHash": "sha256-JXumn7X+suKEcehp4rchSvBzIboqyybQ5bLK4wk7gQU=",
@ -68,7 +34,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718428119, "lastModified": 1718428119,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
@ -86,15 +52,14 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1728008962, "lastModified": 1728008962,

34
flake.nix
View File

@ -3,14 +3,12 @@
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.devshell.url = "github:numtide/devshell";
inputs.rust-overlay.url = "github:oxalica/rust-overlay"; inputs.rust-overlay.url = "github:oxalica/rust-overlay";
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
devshell,
rust-overlay, rust-overlay,
}: }:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
@ -18,7 +16,6 @@
inherit system; inherit system;
config.allowUnfree = true; # For clion config.allowUnfree = true; # For clion
overlays = [ overlays = [
devshell.overlays.default
rust-overlay.overlays.default rust-overlay.overlays.default
]; ];
}; };
@ -28,16 +25,19 @@
extensions = ["rust-src"]; # Include the rust stdlib source for intellij extensions = ["rust-src"]; # Include the rust stdlib source for intellij
}; };
in { in {
devShell = pkgs.devshell.mkShell rec { devShell = pkgs.mkShell rec {
name = "Rust Environment"; name = "Rust Environment";
packages = with pkgs; [ nativeBuildInputs = with pkgs; [
gcc14 gcc14
rust-stable rust-stable
# rust-analyzer # System install # rust-analyzer # System install
# Bevy Dependencies: https://github.com/bevyengine/bevy/blob/release-0.14.2/docs/linux_dependencies.md#nix # Bevy Dependencies: https://github.com/bevyengine/bevy/blob/release-0.14.2/docs/linux_dependencies.md#nix
pkg-config pkg-config
];
buildInputs = with pkgs; [
udev udev
alsa-lib alsa-lib
vulkan-loader vulkan-loader
@ -45,28 +45,8 @@
wayland wayland
]; ];
env = [ RUST_SRC_PATH = "${rust-stable}/lib/rustlib/src/rust/library";
# Allow for intellij to find the stdlib LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
{
name = "RUST_SRC_PATH";
value = "${rust-stable}/lib/rustlib/src/rust/library";
}
# Use this if the rust binary needs additional libraries
{
name = "LD_LIBRARY_PATH";
value = nixpkgs.lib.makeLibraryPath packages;
# value = "${pkgs.xorg.libX11}/lib:${pkgs.xorg.libXcursor}/lib:${pkgs.xorg.libXrandr}/lib:${pkgs.xorg.libXi}/lib:${pkgs.libGL}/lib";
}
];
commands = [
# {
# name = "ide";
# help = "Run clion for project";
# command = "clion &>/dev/null ./ &";
# }
];
}; };
}); });
} }