diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-04 13:54:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 13:54:19 +0000 |
| commit | 4ee9d0508653de1d626c1ee81374acdd422fc37d (patch) | |
| tree | 8f982418d9315d856aea9366bd86e5e6b9c29453 /pkgs/top-level | |
| parent | a381e988babab6f22b35601dcddf91d295f7550d (diff) | |
| parent | d8f8253d3f040982e7948c3ad98efbabf5b771a0 (diff) | |
| download | nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.tar nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.tar.gz nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.tar.bz2 nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.tar.lz nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.tar.xz nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.tar.zst nixlib-4ee9d0508653de1d626c1ee81374acdd422fc37d.zip | |
Merge pull request #36265 from Ekleog/configurable-riot
riot-web: make package configurable
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79d4289d26cc..6d827d7e16d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1332,7 +1332,9 @@ with pkgs; ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; - riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { }; + riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { + conf = config.riot-web.conf or null; + }; rsbep = callPackage ../tools/backup/rsbep { }; |