X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=flakes%2Fmediagoblin%2Fdefault.nix;h=47cc6280a2a0a4e13b3a42519f2653827227d22e;hb=120bcf4d3927f4a0d07513bc54ea5b5fb9b7d809;hp=f50d1c33f57b76a0d3bf112dae0d7344faeebeb9;hpb=bc0f9fcf0d366e10c0046390e516e11d5b76b2f8;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/flakes/mediagoblin/default.nix b/flakes/mediagoblin/default.nix index f50d1c3..47cc628 100644 --- a/flakes/mediagoblin/default.nix +++ b/flakes/mediagoblin/default.nix @@ -143,8 +143,8 @@ let pluginNames = [ "basicsearch" ]; allPlugins = lib.attrsets.genAttrs pluginNames (name: callPackage (./plugins + "/${name}") {}); - toPassthru = pkg: { - inherit allPlugins; + toPassthru = pkg: plugins: { + inherit allPlugins plugins; withPlugins = withPlugins pkg; }; withPlugins = pkg: toPlugins: @@ -153,7 +153,7 @@ let toBuildPlugin = n: "ln -s ${n} mediagoblin/plugins/${n.pluginName}"; newMediagoblin = pkg.overrideAttrs(old: { postBuild = old.postBuild + "\n" + builtins.concatStringsSep "\n" (map toBuildPlugin plugins); - passthru = toPassthru newMediagoblin; + passthru = toPassthru newMediagoblin plugins; }); in newMediagoblin; package = stdenv.mkDerivation rec { @@ -208,6 +208,6 @@ let ''; buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ]; propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ]; - passthru = toPassthru package; + passthru = toPassthru package []; }; in package