nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36265 from Ekleog/configurable-riot

Browse Source 
riot-web: make package configurable
This commit is contained in:
Jörg Thalheim 2018-03-04 13:54:19 +00:00 committed by GitHub
commit 4ee9d05086
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View File

@ -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 = {

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };