Skip to content

Commit 01f1b42

Browse files
committed
refactor: make nixos-generator + /package.nix callPackage-eable
1 parent 89f2a6d commit 01f1b42

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

flake.nix

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,7 @@
116116
pkgs = nixpkgs.legacyPackages."${system}";
117117
in rec {
118118
default = nixos-generate;
119-
nixos-generate = pkgs.stdenv.mkDerivation {
120-
name = "nixos-generate";
121-
src = ./.;
122-
meta.description = "Collection of image builders";
123-
nativeBuildInputs = with pkgs; [makeWrapper];
124-
installFlags = ["PREFIX=$(out)"];
125-
postFixup = ''
126-
wrapProgram $out/bin/nixos-generate \
127-
--prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [jq coreutils findutils])}
128-
'';
129-
};
119+
nixos-generate = pkgs.callPackage ./package.nix {};
130120
});
131121

132122
checks =

package.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
stdenv,
3+
makeWrapper,
4+
jq,
5+
coreutils,
6+
findutils,
7+
lib,
8+
}:
9+
stdenv.mkDerivation {
10+
name = "nixos-generate";
11+
src = ./.;
12+
meta.description = "Collection of image builders";
13+
nativeBuildInputs = [makeWrapper];
14+
installFlags = ["PREFIX=$(out)"];
15+
postFixup = ''
16+
wrapProgram $out/bin/nixos-generate \
17+
--prefix PATH : ${lib.makeBinPath [jq coreutils findutils]}
18+
'';
19+
}

0 commit comments

Comments
 (0)