Skip to content

Commit b7f2486

Browse files
committed
Make flake checks succeed + darwin fix
1 parent 139a72c commit b7f2486

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

flake.nix

+8-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
callPackage = set: pkgs.lib.callPackageWith (pkgs // set);
2121
};
2222

23-
packages = with config; let
23+
derivations = with config; rec {
2424
callPackage = lib.callPackage libs;
2525

2626
libs = {
@@ -38,11 +38,6 @@
3838
inherit versions;
3939
};
4040
};
41-
in rec {
42-
inherit libs;
43-
inherit pkgs;
44-
45-
default = adamantine.versions.devel;
4641

4742
adamantine = let
4843
versions = rec {
@@ -63,6 +58,12 @@
6358
};
6459
};
6560

61+
packages = rec {
62+
default = adamantine.versions.devel;
63+
64+
inherit (derivations) adamantine;
65+
};
66+
6667
devShells = with config; rec {
6768
default = adamantineDev;
6869

@@ -71,10 +72,10 @@
7172

7273
packages = with pkgs; [
7374
git
74-
gdb
7575
clang-tools
7676
ninja
7777
] ++ pkgs.lib.optionals (pkgs.stdenv.hostPlatform.isLinux) [
78+
gdb
7879
cntr
7980
] ++ self.outputs.packages.${system}.default.buildInputs
8081
++ self.outputs.packages.${system}.default.nativeBuildInputs

0 commit comments

Comments
 (0)