From 66c1f82631e51a85994cb6aad3c5b5d2ef4e89f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Jan 2019 07:20:37 +0000 Subject: [PATCH] electron_3: init at 3.1.0 electron 4 had many breaking changes in their API, breaking rambox. Since the 3.x version is still maintained, we can add an older variant. --- pkgs/development/tools/electron/3.x.nix | 77 +++++++++++++++++++ .../tools/electron/print-hashes.sh | 29 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 108 insertions(+) create mode 100644 pkgs/development/tools/electron/3.x.nix create mode 100755 pkgs/development/tools/electron/print-hashes.sh diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix new file mode 100644 index 00000000000..0fe8ab05b68 --- /dev/null +++ b/pkgs/development/tools/electron/3.x.nix @@ -0,0 +1,77 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: + +let + version = "3.1.0"; + name = "electron-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/electron/electron; + license = licenses.mit; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + }; + + linux = { + inherit name version meta; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "09llladfj8l1vnk8fl8ad66qq4czr755fhrp5ciivpbh38zi6d3d"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0g0af1z598f8k2i5sbkzpbga49hbgzl98qgk1n4iagk08iivyfwy"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "1ayfcy7jm7mymmbdq08id9wpjj6cja2cyix1sw2r3m8gpn4l6ih2"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "18cqg9zb98c0rfrdg7ri26dvhjwrwzj41jn8dfra9131xc84nl3i"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin + + fixupPhase + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${gtk2}/lib:${at-spi2-atk}/lib:$out/lib/electron" \ + $out/lib/electron/electron + + wrapProgram $out/lib/electron/electron \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "1cd1ashrcbdjlrr6yijyh2ppk8x8jdw5cm9qnx4lzk7sj9lwjbgb"; + }; + + buildInputs = [ unzip ]; + + buildCommand = '' + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ''; + }; +in + + stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh new file mode 100755 index 00000000000..203e5a4dfec --- /dev/null +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -eu -o pipefail + +if [[ $# -lt 1 ]]; then + echo "$0: version" >&2 + exit 1 +fi + + +VERSION=$1 + +declare -A SYSTEMS HASHES +SYSTEMS=( + [i686-linux]=linux-ia32 + [x86_64-linux]=linux-x64 + [armv7l-linux]=linux-armv7l + [aarch64-linux]=linux-arm64 + [x86_64-darwin]=darwin-x64 +) + +for S in "${!SYSTEMS[@]}"; do + HASHES["$S"]=$(nix-prefetch-url "https://github.com/electron/electron/releases/download/v${VERSION}/electron-v${VERSION}-${SYSTEMS[$S]}.zip") +done + +for S in "${!HASHES[@]}"; do + echo "$S" + echo "sha256 = \"${HASHES[$S]}\";" +done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7ca1c7b8d..a7a0062a1de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8292,6 +8292,8 @@ in electron = callPackage ../development/tools/electron { }; + electron_3 = callPackage ../development/tools/electron/3.x.nix { }; + autobuild = callPackage ../development/tools/misc/autobuild { }; autoconf = callPackage ../development/tools/misc/autoconf { };