pkgs: Inherit callPackage from super

pull/48/head
Simon Bruder 2021-03-20 21:10:09 +01:00
parent 187cc904bc
commit 8a0f3c5f6b
Signed by: simon
GPG Key ID: 8D3C82F9F309F8EC
1 changed files with 7 additions and 6 deletions

View File

@ -1,26 +1,27 @@
self: super: self: super:
let let
inherit (super) callPackage;
srcs = import ./srcs.nix; srcs = import ./srcs.nix;
in in
{ {
bang-evaluator = import srcs.bang-evaluator { pkgs = self; }; bang-evaluator = import srcs.bang-evaluator { pkgs = self; };
bwrap-helper = super.callPackage ./bwrap-helper { }; bwrap-helper = callPackage ./bwrap-helper { };
osu-lazer = super.callPackage ./osu-lazer { inherit (super) osu-lazer; }; osu-lazer = callPackage ./osu-lazer { inherit (super) osu-lazer; };
osu-lazer-sandbox = super.callPackage ./osu-lazer-sandbox { }; osu-lazer-sandbox = callPackage ./osu-lazer-sandbox { };
wordclock-dimmer = super.python3Packages.callPackage ./wordclock-dimmer { }; wordclock-dimmer = super.python3Packages.callPackage ./wordclock-dimmer { };
sbruder = super.recurseIntoAttrs { sbruder = super.recurseIntoAttrs {
imprint = super.callPackage ./imprint { }; imprint = callPackage ./imprint { };
}; };
aria2_exporter = import srcs.aria2_exporter { pkgs = self; }; aria2_exporter = import srcs.aria2_exporter { pkgs = self; };
# adapted nixpkgs upstream but changed to buildGoModule and updated to # adapted nixpkgs upstream but changed to buildGoModule and updated to
# version that works in my setup # version that works in my setup
prometheus-fritzbox-exporter = super.callPackage ./prometheus-fritzbox-exporter { }; prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };
# FIXME: 21.05: Move to home-manager module package attribute # FIXME: 21.05: Move to home-manager module package attribute
mpv-unwrapped = super.mpv-unwrapped.overrideAttrs (o: o // { mpv-unwrapped = super.mpv-unwrapped.overrideAttrs (o: o // {
@ -34,7 +35,7 @@ in
}); });
mpvScripts = (super.mpvScripts or { }) // { mpvScripts = (super.mpvScripts or { }) // {
pitchcontrol = super.callPackage ./mpv-scripts/pitchcontrol { }; pitchcontrol = callPackage ./mpv-scripts/pitchcontrol { };
}; };
# TODO: Remove patch once mako > 1.4.1 is released and in nixpkgs # TODO: Remove patch once mako > 1.4.1 is released and in nixpkgs