JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31730 from gnidorah/rambox

Browse Source 
rambox: allow user to use other auth0 credentials
This commit is contained in:
Orivej Desh 2017-11-17 10:43:52 +00:00 committed by GitHub
commit c0d2ee13be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/rambox/bare.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
auth0Domain = "nixpkgs.auth0.com";
configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
ln -s ${node_modules} node_modules

11
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,10 +1,17 @@
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem }:
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }:
let
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {};
rambox-bare = callPackage ./bare.nix {
inherit auth0ClientID auth0Domain;
};
sencha = callPackage ./sencha {};
};
desktopItem = makeDesktopItem rec {