Merge pull request #16072 from ejlo/fix/electron-update-v1.2.2
electron: 0.36.2 -> 1.2.2
This commit is contained in:
commit
127b4e84f0
@ -1,16 +1,16 @@
|
|||||||
{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
|
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "electron-${version}";
|
name = "electron-${version}";
|
||||||
version = "0.36.2";
|
version = "1.2.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
|
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
|
||||||
sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
|
sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
|
||||||
name = "${name}.zip";
|
name = "${name}.zip";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ unzip ];
|
buildInputs = [ unzip makeWrapper ];
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p $out/lib/electron $out/bin
|
mkdir -p $out/lib/electron $out/bin
|
||||||
@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
|
|||||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||||
--set-rpath "${atomEnv.libPath}:$out/lib/electron" \
|
--set-rpath "${atomEnv.libPath}:$out/lib/electron" \
|
||||||
$out/lib/electron/electron
|
$out/lib/electron/electron
|
||||||
|
|
||||||
|
wrapProgram $out/lib/electron/electron \
|
||||||
|
--prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Cross platform desktop application shell";
|
description = "Cross platform desktop application shell";
|
||||||
homepage = https://github.com/atom/electron;
|
homepage = https://github.com/electron/electron;
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = [ maintainers.travisbhartwell ];
|
maintainers = [ maintainers.travisbhartwell ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user