rambox: 0.5.13 -> 0.5.17
Remove patch that is apparently already applied.
This commit is contained in:
parent
253d78142d
commit
1197f87349
@ -3,13 +3,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rambox-bare-${version}";
|
name = "rambox-bare-${version}";
|
||||||
version = "0.5.13";
|
version = "0.5.17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "saenzramiro";
|
owner = "saenzramiro";
|
||||||
repo = "rambox";
|
repo = "rambox";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
|
sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ nodejs-8_x ruby sencha ];
|
nativeBuildInputs = [ nodejs-8_x ruby sencha ];
|
||||||
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
|
|||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
nodejs = nodejs-8_x;
|
nodejs = nodejs-8_x;
|
||||||
sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
|
sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
|
patches = [ ./isDev.patch ]
|
||||||
++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
|
++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
https://github.com/saenzramiro/rambox/issues/1283
|
|
||||||
|
|
||||||
diff -urNZ a/electron/menu.js b/electron/menu.js
|
|
||||||
--- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000
|
|
||||||
+++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000
|
|
||||||
@@ -220,14 +220,6 @@
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
- label: locale['menu.help[5]'],
|
|
||||||
- click(item, win) {
|
|
||||||
- const webContents = win.webContents;
|
|
||||||
- const send = webContents.send.bind(win.webContents);
|
|
||||||
- send('autoUpdater:check-update');
|
|
||||||
- }
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
label: locale['menu.help[6]'],
|
|
||||||
click() {
|
|
||||||
sendAction('showAbout')
|
|
||||||
@@ -290,14 +282,6 @@
|
|
||||||
type: 'separator'
|
|
||||||
});
|
|
||||||
helpSubmenu.push({
|
|
||||||
- label: `&`+locale['menu.help[5]'],
|
|
||||||
- click(item, win) {
|
|
||||||
- const webContents = win.webContents;
|
|
||||||
- const send = webContents.send.bind(win.webContents);
|
|
||||||
- send('autoUpdater:check-update');
|
|
||||||
- }
|
|
||||||
- });
|
|
||||||
- helpSubmenu.push({
|
|
||||||
label: `&`+locale['menu.help[6]'],
|
|
||||||
click() {
|
|
||||||
sendAction('showAbout')
|
|
Loading…
x
Reference in New Issue
Block a user