|
1 | 1 | {
|
2 | 2 | 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"; |
5 | 4 | flake-utils.url = "github:numtide/flake-utils";
|
6 | 5 | rust-overlay = {
|
7 | 6 | url = "github:oxalica/rust-overlay";
|
8 | 7 | inputs = {
|
9 |
| - nixpkgs.follows = "nixpkgs"; |
| 8 | + nixpkgs.follows = "unstablePkgs"; |
10 | 9 | };
|
11 | 10 | };
|
12 | 11 | };
|
13 |
| - outputs = { self, nixpkgs, unstable, flake-utils, rust-overlay }: |
| 12 | + outputs = { self, unstablePkgs, flake-utils, rust-overlay }: |
14 | 13 | flake-utils.lib.eachDefaultSystem
|
15 | 14 | (system:
|
16 | 15 | let
|
17 | 16 | overlays = [ (import rust-overlay) ];
|
18 |
| - # pkgs = import nixpkgs { |
19 |
| - # inherit system overlays; |
20 |
| - # }; |
21 |
| - unstablePkgs = import unstable { |
| 17 | + unstable = import unstablePkgs { |
22 | 18 | inherit system overlays;
|
23 | 19 | };
|
24 | 20 |
|
25 |
| - rustToolchain = unstablePkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml.stable; |
| 21 | + rustToolchain = unstable.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; |
26 | 22 |
|
27 |
| - common = with unstablePkgs; [ |
| 23 | + common = with unstable; [ |
28 | 24 | gtk3
|
29 | 25 | glib
|
30 | 26 | glib-networking
|
|
41 | 37 | ];
|
42 | 38 |
|
43 | 39 | # runtime Deps
|
44 |
| - libraries = with unstablePkgs;[ |
| 40 | + libraries = with unstable;[ |
45 | 41 | cairo
|
46 | 42 | pango
|
47 | 43 | harfbuzz
|
48 | 44 | gdk-pixbuf
|
49 | 45 | ] ++ common;
|
50 | 46 |
|
51 | 47 | # compile-time deps
|
52 |
| - packages = with unstablePkgs; [ |
| 48 | + packages = with unstable; [ |
53 | 49 | curl
|
54 | 50 | wget
|
55 | 51 | pkg-config
|
56 | 52 | rustToolchain
|
57 | 53 | ] ++ common;
|
58 | 54 | in
|
59 |
| - with unstablePkgs; |
60 | 55 | {
|
61 |
| - devShells.default = mkShell { |
| 56 | + devShells.default = unstable.mkShell { |
62 | 57 | nativeBuildInputs = packages;
|
63 | 58 | buildInputs = libraries;
|
64 | 59 | 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/" |
68 | 63 | '';
|
69 | 64 | };
|
70 | 65 | }
|
|
0 commit comments