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

Merge pull request #32741 from gnidorah/rambox

Browse Source 
rambox: allow user to disable tooltips
This commit is contained in:
Orivej Desh 2017-12-16 20:33:26 +00:00 committed by GitHub
commit f6dd6a438b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
, auth0ClientID, auth0Domain, disableTooltips }:
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
};
patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js

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

@ -1,13 +1,14 @@
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }:
, auth0Domain ? "nixpkgs.auth0.com"
, disableTooltips ? false }:
let
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {
inherit auth0ClientID auth0Domain;
inherit auth0ClientID auth0Domain disableTooltips;
};
sencha = callPackage ./sencha {};
};

19
pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch Normal file
View File

@ -0,0 +1,19 @@
--- index.html.orig 2017-12-16 20:06:03.401298402 +0300
+++ ./index.html 2017-12-16 20:06:21.474484436 +0300
@@ -43,14 +43,14 @@
<!--- Localization -->
<!--- Tooltip player -->
- <script type='text/javascript'>
+ <!--<script type='text/javascript'>
(function(d, s){
var t = d.createElement(s), e = d.getElementsByTagName(s)[0];
t.type = "text/javascript"; e.parentNode.insertBefore(t, e);
t.async = "async";
t.src = "https://cdn.tooltip.io/static/player.js?apiKey=sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2";
})(document, "script");
- </script>
+ </script>-->
<!--- Tooltip player -->
</head>
<body>