Skip to content

Commit f9437ab

Browse files
committed
nix: switch from rust-overlay to rustup, needed by cargo-gpu
1 parent 263abc6 commit f9437ab

File tree

2 files changed

+6
-34
lines changed

2 files changed

+6
-34
lines changed

.nix/flake.lock

Lines changed: 1 addition & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.nix/flake.nix

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,19 @@
1616

1717
inputs = {
1818
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
19-
rust-overlay = {
20-
url = "github:oxalica/rust-overlay";
21-
inputs.nixpkgs.follows = "nixpkgs";
22-
};
2319
flake-utils.url = "github:numtide/flake-utils";
2420

2521
# This is used to provide a identical development shell at `shell.nix` for users that do not use flakes
2622
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
2723
};
2824

29-
outputs = { nixpkgs, rust-overlay, flake-utils, ... }:
25+
outputs = { nixpkgs, flake-utils, ... }:
3026
flake-utils.lib.eachDefaultSystem (system:
3127
let
32-
overlays = [ (import rust-overlay) ];
28+
overlays = [];
3329
pkgs = import nixpkgs {
3430
inherit system overlays;
3531
};
36-
37-
rustc-wasm = pkgs.rust-bin.stable.latest.default.override {
38-
targets = [ "wasm32-unknown-unknown" ];
39-
extensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
40-
};
4132

4233
libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: {
4334
version = "138.0.26";
@@ -79,7 +70,7 @@
7970

8071
# Development tools that don't need to be in LD_LIBRARY_PATH
8172
buildTools = [
82-
rustc-wasm
73+
pkgs.rustup
8374
pkgs.nodejs
8475
pkgs.nodePackages.npm
8576
pkgs.binaryen
@@ -109,6 +100,8 @@
109100
devShells.default = pkgs.mkShell {
110101
packages = buildInputs ++ buildTools ++ devTools;
111102

103+
nativeBuildInputs = [ pkgs.rustup ];
104+
112105
LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}:${libcefPath}";
113106
CEF_PATH = libcefPath;
114107
XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";

0 commit comments

Comments
 (0)