diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2018-06-25 22:29:25 +0300 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-25 21:29:25 +0200 |
| commit | 68bf1063f02d7c1e6b2caa7cf725b884f1865296 (patch) | |
| tree | ddf73016c13a6ba7a59a339824ade3be5dbc954a /pkgs | |
| parent | 32628d18c3aacd0fbadd9d81ac8613a3f2e302fd (diff) | |
| download | nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.tar nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.tar.gz nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.tar.bz2 nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.tar.lz nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.tar.xz nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.tar.zst nixlib-68bf1063f02d7c1e6b2caa7cf725b884f1865296.zip | |
rambox: fix build (#42577)
Diffstat (limited to 'pkgs')
4 files changed, 5 insertions, 26 deletions
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 49cd81ac923c..334c50814d78 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha -, auth0ClientID, auth0Domain, disableTooltips }: +, auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; }; - patches = [ ./isDev.patch ] - ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; + patches = [ ./isDev.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index a601db8c8da5..b6e9c9210251 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,14 +1,13 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" -, disableTooltips ? false }: +, auth0Domain ? "nixpkgs.auth0.com" }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain disableTooltips; + inherit auth0ClientID auth0Domain; }; sencha = callPackage ./sencha {}; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch deleted file mode 100644 index 5ddaa9d51771..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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> diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 46157178fc1a..ca82f30e2d1f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.3"; + version = "6.5.3.6"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; |