keep the original call signature of src/devenv.nix

cachix · Apr 24, 2023 · dd5b388 · dd5b388
1 parent f6ea9df
commit dd5b388
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -28,8 +28,7 @@
       systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
       forAllSystems = f: builtins.listToAttrs (map (name: { inherit name; value = f name; }) systems);
       mkPackage = pkgs: import ./src/devenv.nix {
-        inherit pkgs;
-        nix = nix.packages.${pkgs.stdenv.system}.nix;
+        inherit pkgs nix;
       };
       mkDevShellPackage = config: pkgs: import ./src/devenv-devShell.nix { inherit config pkgs; };
       mkDocOptions = pkgs:

diff --git a/src/devenv.nix b/src/devenv.nix
@@ -1,4 +1,4 @@
-{ pkgs, nix }:
+{ pkgs, ... } @ args:
 let
   examples = ../examples;
   lib = pkgs.lib;
@@ -12,6 +12,7 @@ let
     docopts
     util-linuxMinimal;
   devenv-yaml = import ./devenv-yaml.nix { inherit pkgs; };
+  nix = args.nix.packages.${pkgs.stdenv.system}.nix;
 in
 pkgs.writeScriptBin "devenv" ''
   #!${bash}/bin/bash