From 8a0f3c5f6b037001802ca6213dc4fa7635f3fae3 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 20 Mar 2021 21:10:09 +0100 Subject: [PATCH] pkgs: Inherit callPackage from super --- pkgs/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 46a0a84..89ed1f0 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,26 +1,27 @@ self: super: let + inherit (super) callPackage; srcs = import ./srcs.nix; in { 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-sandbox = super.callPackage ./osu-lazer-sandbox { }; + osu-lazer = callPackage ./osu-lazer { inherit (super) osu-lazer; }; + osu-lazer-sandbox = callPackage ./osu-lazer-sandbox { }; wordclock-dimmer = super.python3Packages.callPackage ./wordclock-dimmer { }; sbruder = super.recurseIntoAttrs { - imprint = super.callPackage ./imprint { }; + imprint = callPackage ./imprint { }; }; aria2_exporter = import srcs.aria2_exporter { pkgs = self; }; # adapted nixpkgs upstream but changed to buildGoModule and updated to # 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 mpv-unwrapped = super.mpv-unwrapped.overrideAttrs (o: o // { @@ -34,7 +35,7 @@ in }); 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