Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-04 13:02:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: rustup nightly breaks nixos with ldd -> rollback version of rust

Browse source
This commit is contained in:
DashieTM 2024-05-20 22:07:35 +02:00
parent 397c48ae43
commit 3cb7cd2d7f
6 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.direnv/flake-profile
View file

@ -1 +1 @@
flake-profile-1-link
flake-profile-2-link

1
.direnv/flake-profile-1-link
View file

@ -1 +0,0 @@
/nix/store/a7q30l1dy9h81iddq6ysf67616mbjfv2-nix-shell-env

1
.direnv/flake-profile-2-link Symbolic link
View file

@ -0,0 +1 @@
/nix/store/xrq8ppsi3rg3qjvlkvkvndic04y99djw-nix-shell-env

11
flake.lock
View file

@ -85,12 +85,15 @@
"locked": {
"lastModified": 1716171463,
"narHash": "sha256-lc7wOh5BjYUoxdhcPkeUY8BmuL2qtRaHlW1403RW48E=",
"type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "04d61d14803854fd8453ec43c5c53a471e5407a8",
"type": "github"
},
"original": {
"type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {

9
flake.nix
View file

@ -7,9 +7,7 @@
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
rust-overlay = {
url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz";
};
rust-overlay.url = "github:oxalica/rust-overlay";
};
outputs = inputs @ { self, flake-parts, ... }:
@ -36,8 +34,9 @@
devShells.default = pkgs.mkShell {
inputsFrom = builtins.attrValues self'.packages;
packages = with pkgs; [
(rust-bin.selectLatestNightlyWith
(toolchain: toolchain.default))
# (rust-bin.selectLatestNightlyWith
# (toolchain: toolchain.default))
rust-bin.nightly."2024-05-10".default
];
};

5
nix/default.nix
View file

@ -37,8 +37,9 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
(rust-bin.selectLatestNightlyWith
(toolchain: toolchain.default))
# (rust-bin.selectLatestNightlyWith
# (toolchain: toolchain.default))
rust-bin.nightly."2024-05-10".default
];
copyLibs = true;