octoprint.plugins: use callPackage

This commit is contained in:
Sandro Jäckel 2023-04-09 02:05:58 +02:00
parent a6ab4bfac4
commit f7050cc88c
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 8 additions and 5 deletions

View File

@ -1,5 +1,6 @@
{ pkgs
, stdenv
, callPackage
, lib
, fetchFromGitHub
, python3
@ -258,7 +259,7 @@ let
};
}
)
(import ./plugins.nix { inherit pkgs; })
(callPackage ./plugins.nix { })
packageOverrides
]
);

View File

@ -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; {