diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 4c740852f6af..40bf9884f705 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,5 +1,6 @@ { pkgs , stdenv +, callPackage , lib , fetchFromGitHub , python3 @@ -258,7 +259,7 @@ let }; } ) - (import ./plugins.nix { inherit pkgs; }) + (callPackage ./plugins.nix { }) packageOverrides ] ); diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 822f2c13cbea..3f994dbe459e 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,6 +1,8 @@ -{ pkgs }: - -with pkgs; +{ lib +, fetchFromGitHub +, fetchFromGitLab +, marlin-calc +}: self: super: let @@ -246,7 +248,7 @@ in preConfigure = '' # PrintTimeGenius ships with marlin-calc binaries for multiple architectures rm */analyzers/marlin-calc* - sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py ''; meta = with lib; {