diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 2e30ab269c22..dae7105172cb 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -30,11 +30,11 @@ let r13y reproducibility ''; - dwWithAcronyms = pkgs.dokuwiki.overrideAttrs (prev: { - installPhase = prev.installPhase or "" + '' - ln -sf ${acronymsFile} $out/share/dokuwiki/conf/acronyms.local.conf - ''; - }); + dwWithAcronyms = pkgs.dokuwiki.combine { + extraConfigs = { + "acronyms.local.conf" = acronymsFile; + }; + }; mkNode = webserver: diff --git a/pkgs/by-name/do/dokuwiki/package.nix b/pkgs/by-name/do/dokuwiki/package.nix index 980073366c38..0796e233496a 100644 --- a/pkgs/by-name/do/dokuwiki/package.nix +++ b/pkgs/by-name/do/dokuwiki/package.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { localConfig ? null, pluginsConfig ? null, aclConfig ? null, + extraConfigs ? { }, pname ? (p: "${p.pname}-combined"), }: let @@ -76,6 +77,12 @@ stdenv.mkDerivation rec { "" ] ); + + configs = { + "local.php" = localConfig; + "plugins.local.php" = pluginsConfig; + } + // extraConfigs; in basePackage.overrideAttrs (prev: { pname = if builtins.isFunction pname then pname prev else pname; @@ -87,8 +94,9 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" ( plugin: "cp -r ${toString plugin} $out/share/dokuwiki/lib/plugins/${plugin.name}" ) plugins} - ${isNotEmpty localConfig "ln -sf ${localConfig} $out/share/dokuwiki/conf/local.php"} - ${isNotEmpty pluginsConfig "ln -sf ${pluginsConfig} $out/share/dokuwiki/conf/plugins.local.php"} + ${lib.concatMapAttrsStringSep "\n" ( + name: path: "${isNotEmpty path "ln -sf ${path} $out/share/dokuwiki/conf/${name}"}" + ) configs} ${isNotEmpty aclConfig "ln -sf ${aclConfig} $out/share/dokuwiki/acl.auth.php"} ''; });