rambox: fix build (#42577)
This commit is contained in:
parent
32628d18c3
commit
68bf1063f0
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
|
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
|
||||||
, auth0ClientID, auth0Domain, disableTooltips }:
|
, auth0ClientID, auth0Domain }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rambox-bare-${version}";
|
name = "rambox-bare-${version}";
|
||||||
@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
|
sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./isDev.patch ]
|
patches = [ ./isDev.patch ];
|
||||||
++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
|
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
|
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
|
||||||
|
@ -1,14 +1,13 @@
|
|||||||
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
|
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
|
||||||
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
|
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
|
||||||
, auth0Domain ? "nixpkgs.auth0.com"
|
, auth0Domain ? "nixpkgs.auth0.com" }:
|
||||||
, disableTooltips ? false }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
callPackage = newScope self;
|
||||||
self = {
|
self = {
|
||||||
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
|
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
|
||||||
rambox-bare = callPackage ./bare.nix {
|
rambox-bare = callPackage ./bare.nix {
|
||||||
inherit auth0ClientID auth0Domain disableTooltips;
|
inherit auth0ClientID auth0Domain;
|
||||||
};
|
};
|
||||||
sencha = callPackage ./sencha {};
|
sencha = callPackage ./sencha {};
|
||||||
};
|
};
|
||||||
|
@ -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>
|
|
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchurl, gzip, which, unzip, jdk }:
|
{ stdenv, fetchurl, gzip, which, unzip, jdk }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "6.5.3";
|
version = "6.5.3.6";
|
||||||
srcs = {
|
srcs = {
|
||||||
i686-linux = fetchurl {
|
i686-linux = fetchurl {
|
||||||
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
|
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user