Merge pull request #12540 from xokdvium/fix/devshell

packaging: Fix devShell
NixOS · Feb 20, 2025 · 0da6a4a · 0da6a4a
2 parents 76f4119 + 6877988
commit 0da6a4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -403,7 +403,7 @@
 
       devShells =
         let
-          makeShell = import ./packaging/dev-shell.nix { inherit inputs lib devFlake; };
+          makeShell = import ./packaging/dev-shell.nix { inherit lib devFlake; };
           prefixAttrs = prefix: lib.concatMapAttrs (k: v: { "${prefix}-${k}" = v; });
         in
         forAllSystems (

diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  inputs,
   devFlake,
 }:
 
@@ -117,7 +116,7 @@ pkgs.nixComponents.nix-util.overrideAttrs (
         pkgs.buildPackages.changelog-d
         modular.pre-commit.settings.package
         (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript)
-        inputs.nixfmt.packages.${pkgs.hostPlatform.system}.default
+        pkgs.buildPackages.nixfmt-rfc-style
       ]
       # TODO: Remove the darwin check once
       # /~https://github.com/NixOS/nixpkgs/pull/291814 is available