mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-27 14:34:33 +00:00
octoprint.plugins: use callPackage
This commit is contained in:
parent
a6ab4bfac4
commit
f7050cc88c
@ -1,5 +1,6 @@
|
||||
{ pkgs
|
||||
, stdenv
|
||||
, callPackage
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
@ -258,7 +259,7 @@ let
|
||||
};
|
||||
}
|
||||
)
|
||||
(import ./plugins.nix { inherit pkgs; })
|
||||
(callPackage ./plugins.nix { })
|
||||
packageOverrides
|
||||
]
|
||||
);
|
||||
|
@ -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; {
|
||||
|
Loading…
Reference in New Issue
Block a user