From f7050cc88c479dc137f7b5c02f5012488ca02352 Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Sun, 9 Apr 2023 02:05:58 +0200
Subject: octoprint.plugins: use callPackage

---
 pkgs/applications/misc/octoprint/default.nix |  3 ++-
 pkgs/applications/misc/octoprint/plugins.nix | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 4c740852f6a..40bf9884f70 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 822f2c13cbe..3f994dbe459 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; {
-- 
cgit 1.4.1