X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=18fc3b3a81ba441920657961d7d7ab855562f028;hb=7667c367033b15582cf383da62446f78e66a59ef;hp=d1d8fa497bcaa69e96879a0240d9c064ab03cf6a;hpb=20e1428fae47a5a59376b624336597eed1b605f5;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index d1d8fa4..18fc3b3 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,8 +1,9 @@
 { pkgs }:
 with pkgs;
-let mylibs = import ../libs.nix { inherit pkgs; };
+let
+  mylibs = import ../libs.nix { inherit pkgs; };
 in
-{
+rec {
   boinctui = callPackage ../pkgs/boinctui {};
   cnagios = callPackage ../pkgs/cnagios { inherit mylibs; };
   duply = callPackage ../pkgs/duply {};
@@ -34,7 +35,12 @@ in
   mpd = (callPackage ../pkgs/mpd_0_21 {}).mpd;
   mpd-small = (callPackage ../pkgs/mpd_0_21 {}).mpd-small;
 
-  webapps = {
-    mastodon = (callPackage ./webapps/mastodon { inherit mylibs; });
-  };
+  bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
+
+  composerEnv = callPackage ./composer-env {};
+  webapps = callPackage ./webapps { inherit mylibs composerEnv; };
+
+  private = if builtins.pathExists (./. + "/private")
+    then import ./private { inherit pkgs; }
+    else { webapps = {}; };
 }