From d8f8253d3f040982e7948c3ad98efbabf5b771a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 3 Mar 2018 22:24:24 +0100 Subject: [PATCH] riot-web: make package configurable --- .../networking/instant-messengers/riot/riot-web.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ea8874548155..b47280d3b156 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }: +let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; version = "0.13.5"; @@ -12,6 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/ cp -R . $out/ + ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"} ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 140da3dd2f2b..e211cfaeb7c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1321,7 +1321,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; + }; rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken