Skip to content

Commit b741b9f

Browse files
authored
fix: update flake config to run again (#4641)
1 parent 9a0e484 commit b741b9f

File tree

2 files changed

+18
-40
lines changed

2 files changed

+18
-40
lines changed

flake.lock

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

flake.nix

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
4-
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
3+
unstablePkgs.url = "github:nixos/nixpkgs/nixos-unstable";
54
flake-utils.url = "github:numtide/flake-utils";
65
rust-overlay = {
76
url = "github:oxalica/rust-overlay";
87
inputs = {
9-
nixpkgs.follows = "nixpkgs";
8+
nixpkgs.follows = "unstablePkgs";
109
};
1110
};
1211
};
13-
outputs = { self, nixpkgs, unstable, flake-utils, rust-overlay }:
12+
outputs = { self, unstablePkgs, flake-utils, rust-overlay }:
1413
flake-utils.lib.eachDefaultSystem
1514
(system:
1615
let
1716
overlays = [ (import rust-overlay) ];
18-
# pkgs = import nixpkgs {
19-
# inherit system overlays;
20-
# };
21-
unstablePkgs = import unstable {
17+
unstable = import unstablePkgs {
2218
inherit system overlays;
2319
};
2420

25-
rustToolchain = unstablePkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml.stable;
21+
rustToolchain = unstable.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
2622

27-
common = with unstablePkgs; [
23+
common = with unstable; [
2824
gtk3
2925
glib
3026
glib-networking
@@ -41,30 +37,29 @@
4137
];
4238

4339
# runtime Deps
44-
libraries = with unstablePkgs;[
40+
libraries = with unstable;[
4541
cairo
4642
pango
4743
harfbuzz
4844
gdk-pixbuf
4945
] ++ common;
5046

5147
# compile-time deps
52-
packages = with unstablePkgs; [
48+
packages = with unstable; [
5349
curl
5450
wget
5551
pkg-config
5652
rustToolchain
5753
] ++ common;
5854
in
59-
with unstablePkgs;
6055
{
61-
devShells.default = mkShell {
56+
devShells.default = unstable.mkShell {
6257
nativeBuildInputs = packages;
6358
buildInputs = libraries;
6459
shellHook = ''
65-
export LD_LIBRARY_PATH=${unstablePkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
66-
export XDG_DATA_DIRS=${unstablePkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${unstablePkgs.gsettings-desktop-schemas.name}:${unstablePkgs.gtk3}/share/gsettings-schemas/${unstablePkgs.gtk3.name}:$XDG_DATA_DIRS
67-
export GIO_MODULE_DIR="${unstablePkgs.glib-networking}/lib/gio/modules/"
60+
export LD_LIBRARY_PATH=${unstable.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
61+
export XDG_DATA_DIRS=${unstable.gsettings-desktop-schemas}/share/gsettings-schemas/${unstable.gsettings-desktop-schemas.name}:${unstable.gtk3}/share/gsettings-schemas/${unstable.gtk3.name}:$XDG_DATA_DIRS
62+
export GIO_MODULE_DIR="${unstable.glib-networking}/lib/gio/modules/"
6863
'';
6964
};
7065
}

0 commit comments

Comments
 (0)