Skip to content

Commit c52c330

Browse files
committed
chore: rustup nightly breaks nixos with ldd -> rollback version of rust
1 parent e073153 commit c52c330

7 files changed

+16
-28
lines changed

.direnv/flake-profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
flake-profile-3-link
1+
flake-profile-4-link

.direnv/flake-profile-3-link

-1
This file was deleted.

.direnv/flake-profile-4-link

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/y6nb7kpmp5kib60ainkxx5gdi0cbhy0m-nix-shell-env

default.nix

-15
This file was deleted.

flake.lock

+7-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
url = "github:hercules-ci/flake-parts";
88
inputs.nixpkgs-lib.follows = "nixpkgs";
99
};
10-
rust-overlay = {
11-
url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz";
12-
};
10+
rust-overlay.url = "github:oxalica/rust-overlay";
1311
};
1412

1513
outputs = inputs @ { self, flake-parts, ... }:
@@ -36,8 +34,9 @@
3634
devShells.default = pkgs.mkShell {
3735
inputsFrom = builtins.attrValues self'.packages;
3836
packages = with pkgs; [
39-
(rust-bin.selectLatestNightlyWith
40-
(toolchain: toolchain.default))
37+
# (rust-bin.selectLatestNightlyWith
38+
# (toolchain: toolchain.default))
39+
rust-bin.nightly."2024-05-10".default
4140
];
4241
};
4342

nix/default.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ rustPlatform.buildRustPackage rec {
3232
nativeBuildInputs = [
3333
pkg-config
3434
wrapGAppsHook4
35-
(rust-bin.selectLatestNightlyWith
36-
(toolchain: toolchain.default))
35+
# (rust-bin.selectLatestNightlyWith
36+
# (toolchain: toolchain.default))
37+
rust-bin.nightly."2024-05-10".default
3738
];
3839

3940
copyLibs = true;

0 commit comments

Comments
 (0)