X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=297f524d469f317d1f33fe8c8637eaaee7883afd;hb=dbcba2ea2b7301aaa7e6487c2589b09ef09ba066;hp=b97b26720d5c75f59f3de8e7c148c3b6191fab60;hpb=fd2d83bd2bf20fafc63daf5041db0151a4b4d17d;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b97b267..297f524 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,7 @@
 { pkgs }:
 with pkgs;
-let mylibs = import ../libs.nix { inherit pkgs; };
+let
+  mylibs = import ../lib { inherit pkgs; };
 in
 rec {
   boinctui = callPackage ../pkgs/boinctui {};
@@ -37,5 +38,14 @@ rec {
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
   composerEnv = callPackage ./composer-env {};
-  webapps = callPackage ./webapps { inherit mylibs composerEnv; };
+  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
+
+  private = if builtins.pathExists (./. + "/private")
+    then import ./private { inherit pkgs; }
+    else { webapps = {}; };
+
+  python3PackagesPlus = callPackage ./python-packages {
+    python = python3;
+    inherit mylibs;
+  };
 }