From 231d85292194dcfda38cd49a379ad5620707e111 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 3 Mar 2017 22:31:23 +0100 Subject: machines/katara: correct searx override --- machines/profpatsch/pkgs.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'machines') diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index 0c1ac109..debed121 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -64,15 +64,23 @@ let xmpp-client = pkgs.callPackage (import ./xmpp-client.nix myLib.philip.home "irc/xmppOla.wtf") { inherit (pkgs) xmpp-client; }; - searx = pkgs.pythonPackages.searx.overrideDerivation (old: { - patches = old.patches or [] ++ [ - ./patches/searx-secret-key.patch - ./patches/searx-rm-soundcloud.patch - ]; - }); + pythonPackagesMod = pkgs.pythonPackages.override { + overrides = self: super: { + searx = super.searx.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pythonPackages.pyxdg ]; + patches = old.patches or [] ++ [ + ./patches/searx-secret-key.patch + ./patches/searx-rm-soundcloud.patch + ]; + }); + }; + }; + # A ghci with some sane default packages in scope, & hoogle saneGhci = haskellPackages.ghcWithHoogle (h: with h; [ protolude pretty-show ]); in -{ inherit taffybar sent mpv beets poezio vim fast-init xmpp-client searx saneGhci; } +{ inherit taffybar sent mpv beets poezio vim + fast-init xmpp-client saneGhci; + inherit (pythonPackagesMod) searx; } -- cgit 1.4.1