diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-11 12:16:57 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-11 12:16:57 +0200 |
commit | 1bd8b03eeaafa9345282d8aaf6499bc80adf062f (patch) | |
tree | a80e655fbf0dad25c29c41a7f880a4c3574edebf /pkgs/default.nix | |
parent | 9eae2b47b7b315b05a0e010f3003bd875685e260 (diff) | |
download | Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.tar.gz Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.tar.zst Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.zip |
Move Aten packages to pkgs
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r-- | pkgs/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index b97b267..18fc3b3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix | |||
@@ -1,6 +1,7 @@ | |||
1 | { pkgs }: | 1 | { pkgs }: |
2 | with pkgs; | 2 | with pkgs; |
3 | let mylibs = import ../libs.nix { inherit pkgs; }; | 3 | let |
4 | mylibs = import ../libs.nix { inherit pkgs; }; | ||
4 | in | 5 | in |
5 | rec { | 6 | rec { |
6 | boinctui = callPackage ../pkgs/boinctui {}; | 7 | boinctui = callPackage ../pkgs/boinctui {}; |
@@ -38,4 +39,8 @@ rec { | |||
38 | 39 | ||
39 | composerEnv = callPackage ./composer-env {}; | 40 | composerEnv = callPackage ./composer-env {}; |
40 | webapps = callPackage ./webapps { inherit mylibs composerEnv; }; | 41 | webapps = callPackage ./webapps { inherit mylibs composerEnv; }; |
42 | |||
43 | private = if builtins.pathExists (./. + "/private") | ||
44 | then import ./private { inherit pkgs; } | ||
45 | else { webapps = {}; }; | ||
41 | } | 46 | } |