diff options
| author | pacien <pacien.trangirard@pacien.net> | 2019-07-13 00:55:23 +0200 |
|---|---|---|
| committer | pacien <pacien.trangirard@pacien.net> | 2019-07-13 00:55:23 +0200 |
| commit | 9e9cc366d054bfaa995787b82257b241c4d575d4 (patch) | |
| tree | 18487b023b17f33194989b3203c8d48b490e07ad /pkgs/applications/networking/instant-messengers/riot | |
| parent | 3c84ac7523aaf22febd14bfd2b39a0755d46128b (diff) | |
| download | nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.tar nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.tar.gz nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.tar.bz2 nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.tar.lz nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.tar.xz nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.tar.zst nixpkgs-9e9cc366d054bfaa995787b82257b241c4d575d4.zip | |
riot-web: fallback to example config
Since 1.2.2, specifying defaults seems to be required for the app to start.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/riot')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-web.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 61a581e834c..2d6c0df412a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,7 +3,6 @@ # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. -let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; version = "1.2.2"; @@ -13,10 +12,14 @@ stdenv.mkDerivation rec { sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; }; - installPhase = '' + installPhase = let + configFile = if (conf != null) + then writeText "riot-config.json" conf + else "$out/config.sample.json"; + in '' mkdir -p $out/ cp -R . $out/ - ${lib.optionalString (conf != null) "ln -s ${configFile} $out/config.json"} + ln -s ${configFile} $out/config.json ''; meta = { |