summaryrefslogtreecommitdiffstats
path: root/pkgs/development/tools/electron
diff options
context:
space:
mode:
authorErik Ouchterlony <erik.ouchterlony@bredband.net>2016-06-08 20:31:36 +0200
committerErik Ouchterlony <erik.ouchterlony@bredband.net>2016-06-08 20:31:36 +0200
commit331cbe78489585bde4727145958dc3f7e238b970 (patch)
tree658c401c0e746e6f33fd9a6562ce86ff7b14a897 /pkgs/development/tools/electron
parent964665eb1c75e0bb596e08a92a6c872b5ae06a31 (diff)
electron: 0.36.2 -> 1.2.2
Diffstat (limited to 'pkgs/development/tools/electron')
-rw-r--r--pkgs/development/tools/electron/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index a3afc235a6c5..7c8315859560 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
+{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
stdenv.mkDerivation rec {
name = "electron-${version}";
- version = "0.36.2";
+ version = "1.2.2";
src = fetchurl {
- url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
- sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
+ url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
+ sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
name = "${name}.zip";
};
- buildInputs = [ unzip ];
+ buildInputs = [ unzip makeWrapper ];
buildCommand = ''
mkdir -p $out/lib/electron $out/bin
@@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/lib/electron" \
$out/lib/electron/electron
+
+ wrapProgram $out/lib/electron/electron \
+ --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
'';
meta = with stdenv.lib; {
description = "Cross platform desktop application shell";
- homepage = https://github.com/atom/electron;
+ homepage = https://github.com/electron/electron;
license = licenses.mit;
maintainers = [ maintainers.travisbhartwell ];
platforms = [ "x86_64-linux" ];