From 34c7b88e16d1768b1b9a0cfa6dd21ea5d9b1b308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 8 May 2020 23:59:21 +0200 Subject: Use new withPlugin system - dokuwiki - mantisbt - mediagoblin - roundcube - ttrss - yourls --- pkgs/webapps/yourls/default.nix | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'pkgs/webapps/yourls/default.nix') diff --git a/pkgs/webapps/yourls/default.nix b/pkgs/webapps/yourls/default.nix index 4bcfa4c..d940c54 100644 --- a/pkgs/webapps/yourls/default.nix +++ b/pkgs/webapps/yourls/default.nix @@ -1,16 +1,21 @@ -{ yourls_config ? "/etc/yourls/config.php", mylibs, stdenv }: +{ yourls_config ? "/etc/yourls/config.php", mylibs, callPackage, lib, stdenv }: let - withPlugins = plugins: package.overrideAttrs(old: { - name = "${old.name}-with-plugins"; - installPhase = old.installPhase + - builtins.concatStringsSep "\n" ( - map (value: "ln -s ${value} $out/user/plugins/${value.pluginName}") plugins - ); - passthru = old.passthru // { - inherit plugins; - withPlugins = morePlugins: old.withPlugins (morePlugins ++ plugins); - }; - }); + pluginNames = [ "ldap" ]; + allPlugins = lib.attrsets.genAttrs pluginNames + (name: callPackage (./plugins + "/${name}") { inherit mylibs; }); + toPassthru = pkg: plugins: { + inherit plugins allPlugins; + withPlugins = withPlugins pkg; + }; + withPlugins = pkg: toPlugins: + let + plugins = toPlugins allPlugins; + toInstallPlugin = n: "ln -s ${n} $out/user/plugins/${n.pluginName}"; + newYourls = pkg.overrideAttrs(old: { + installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins); + passthru = toPassthru newYourls (pkg.plugins ++ plugins); + }); + in newYourls; package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec { installPhase = '' mkdir -p $out @@ -18,9 +23,6 @@ let cp sample-robots.txt $out/robots.txt ln -sf ${yourls_config} $out/includes/config.php ''; - passthru = { - plugins = []; - inherit withPlugins; - }; + passthru = toPassthru package []; }); in package -- cgit v1.2.3