diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 10:43:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 10:43:52 +0000 |
| commit | c0d2ee13be988ffc719c8f6eea747e0d7549915e (patch) | |
| tree | 452c82821f962269b72f1837bf4d39c3d8619db5 | |
| parent | acb7f43db94f78a7dfd1fcb507f9a78d0449639d (diff) | |
| parent | a5b882310f1a925ad56f0bec59a102d0e8b75152 (diff) | |
| download | nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.tar nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.tar.gz nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.tar.bz2 nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.tar.lz nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.tar.xz nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.tar.zst nixpkgs-c0d2ee13be988ffc719c8f6eea747e0d7549915e.zip | |
Merge pull request #31730 from gnidorah/rambox
rambox: allow user to use other auth0 credentials
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/bare.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/default.nix | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index ceb922624a1..543bf642525 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -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 diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 1523d16be56..05e1d902dd7 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -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 { |