aboutsummaryrefslogtreecommitdiff
path: root/pkgs/webapps/nextcloud
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-07 15:07:35 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-07 15:07:35 +0200
commite6abbae25ce533e8d38a0e8318b1d5d5a35d813d (patch)
tree595ba9116ce5593594994bfcfec775c1b4488ba5 /pkgs/webapps/nextcloud
parent79d2de8b83d765721b2cb720b2bc59673df54a4a (diff)
downloadNix-e6abbae25ce533e8d38a0e8318b1d5d5a35d813d.tar.gz
Nix-e6abbae25ce533e8d38a0e8318b1d5d5a35d813d.tar.zst
Nix-e6abbae25ce533e8d38a0e8318b1d5d5a35d813d.zip
Fix passthru’s in pkgs
Diffstat (limited to 'pkgs/webapps/nextcloud')
-rw-r--r--pkgs/webapps/nextcloud/default.nix20
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index 0287f75..2d4eb39 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -19,15 +19,17 @@ let
19 map (value: "ln -sf ${value} $out/apps/${value.appName}") apps 19 map (value: "ln -sf ${value} $out/apps/${value.appName}") apps
20 )); 20 ));
21 21
22 passthru.otherConfig = with lib.attrsets; with lib.lists; let 22 passthru = old.passthru // {
23 zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps); 23 otherConfig = with lib.attrsets; with lib.lists; let
24 in 24 zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps);
25 { 25 in
26 mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases; 26 {
27 mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping); 27 mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases;
28 }; 28 mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping);
29 passthru.apps = apps; 29 };
30 passthru.withApps = moreApps: old.withApps (moreApps ++ apps); 30 inherit apps;
31 withApps = moreApps: old.withApps (moreApps ++ apps);
32 };
31 }); 33 });
32 34
33 package = stdenv.mkDerivation rec { 35 package = stdenv.mkDerivation rec {