import attrset via runCommand

aksiksi · Nov 8, 2023 · c7fd6f1 · c7fd6f1
1 parent f681ae3
commit c7fd6f1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/flake.nix b/flake.nix
@@ -44,7 +44,6 @@
           # https://nixos.org/manual/nixos/stable/#sec-option-declarations
           paths = mkOption {
             type = types.listOf types.path;
-            default = [];
             description = lib.mdDoc "One or more paths to Docker Compose files.";
           };
           runtime = mkOption {
@@ -88,27 +87,25 @@
             description = lib.mdDoc "Auto-start all containers.";
           };
         };
-        config.compose2nix = mkIf (cfg.paths != []) {
-          # runCommandLocal ensures that we always build this derivation on the local machine.
-          # This allows us to circumvent the Nix binary cache and minimize the time spent outside
-          # of building the derivation.
-          # https://nixos.org/manual/nixpkgs/stable/#trivial-builder-runCommandLocal
-          output = pkgs.runCommandLocal "run-compose2nix" {
+        # runCommandLocal ensures that we always build this derivation on the local machine.
+        # This allows us to circumvent the Nix binary cache and minimize the time spent outside
+        # of building the derivation.
+        # https://nixos.org/manual/nixpkgs/stable/#trivial-builder-runCommandLocal
+        config = mkIf (cfg.paths != []) (import pkgs.runCommandLocal "compose2nix" {
             env = cfg.env;
             buildInputs = [ pkgs.compose2nix ];
-          } ''
-            ${pkgs.compose2nix}/bin/compose2nix \
-              -paths='${concatStringsSep "," cfg.paths}' \
-              -runtime=${cfg.runtime} \
-              -project=${cfg.project} \
-              -project_separator='${cfg.projectSeparator}' \
-              -env_files='${concatStringsSep "," cfg.envFiles}' \
-              -env_files_only=${cfg.envFilesOnly} \
-              -service_include='${cfg.serviceInclude}' \
-              -auto_start=${cfg.autoStart} \
-              -output=$out
-          '';
-        };
+        } ''
+          ${pkgs.compose2nix}/bin/compose2nix \
+            -paths='${concatStringsSep "," cfg.paths}' \
+            -runtime=${cfg.runtime} \
+            -project=${cfg.project} \
+            -project_separator='${cfg.projectSeparator}' \
+            -env_files='${concatStringsSep "," cfg.envFiles}' \
+            -env_files_only=${cfg.envFilesOnly} \
+            -service_include='${cfg.serviceInclude}' \
+            -auto_start=${cfg.autoStart} \
+            -output=$out
+        '');
       };
     });
   };

diff --git a/templates/main.nix.tmpl b/templates/main.nix.tmpl
@@ -1,6 +1,4 @@
 {{- $runtime := .Runtime | printf "%s" -}}
-{ pkgs, ... }:
-
 {
   # Runtime
   virtualisation.{{$runtime}} = {

diff --git a/testdata/TestDocker_WithProject_out.nix b/testdata/TestDocker_WithProject_out.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   # Runtime
   virtualisation.docker = {

diff --git a/testdata/TestDocker_out.nix b/testdata/TestDocker_out.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   # Runtime
   virtualisation.docker = {

diff --git a/testdata/TestPodman_WithProject_out.nix b/testdata/TestPodman_WithProject_out.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   # Runtime
   virtualisation.podman = {

diff --git a/testdata/TestPodman_out.nix b/testdata/TestPodman_out.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   # Runtime
   virtualisation.podman = {