Merge pull request #86230 from prusnak/electron-cleanup
electron_3: refactor
This commit is contained in:
Marek Mahut
GitHub
commit
9ed9140cc6
@ -1,33 +1,24 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, systemd
|
||||
, gcc-unwrapped
|
||||
, xorg
|
||||
, electron_3
|
||||
, wrapGAppsHook
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libxkbcommon
|
||||
xorg.libXt
|
||||
systemd.lib
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = "Obinskit";
|
||||
exec = "obinskit";
|
||||
icon = "obinskit.png";
|
||||
icon = "obinskit";
|
||||
desktopName = "Obinskit";
|
||||
genericName = "Obinskit keyboard configurator";
|
||||
categories = "Utility";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obinskit";
|
||||
version = "1.1.4";
|
||||
|
||||
@ -40,44 +31,33 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "ObinsKit_${version}_x64";
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/opt/obinskit
|
||||
install icudtl.dat $out/opt/obinskit/
|
||||
install natives_blob.bin $out/opt/obinskit/
|
||||
install v8_context_snapshot.bin $out/opt/obinskit/
|
||||
install blink_image_resources_200_percent.pak $out/opt/obinskit/
|
||||
install content_resources_200_percent.pak $out/opt/obinskit/
|
||||
install content_shell.pak $out/opt/obinskit/
|
||||
install ui_resources_200_percent.pak $out/opt/obinskit/
|
||||
install views_resources_200_percent.pak $out/opt/obinskit/
|
||||
|
||||
cp -r resources $out/opt/obinskit/
|
||||
cp -r locales $out/opt/obinskit/
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${electron_3}/bin/electron $out/bin/obinskit
|
||||
|
||||
mkdir -p $out/share/{applications,pixmaps}
|
||||
install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--add-flags $out/opt/obinskit/resources/app.asar
|
||||
--prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
)
|
||||
postFixup = ''
|
||||
makeWrapper ${electron_3}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/opt/obinskit/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graphical configurator for Anne Pro and Anne Pro II keyboards";
|
||||
homepage = "http://en.obins.net/obinskit/";
|
||||
homepage = "http://en.obins.net/obinskit/"; # https is broken
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.shou ];
|
||||
maintainers = with maintainers; [ shou ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }:
|
||||
|
||||
let
|
||||
version = "3.1.13";
|
||||
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 = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
|
||||
sha256 = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
|
||||
sha256 = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
|
||||
sha256 = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8";
|
||||
};
|
||||
}.${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 = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx";
|
||||
};
|
||||
|
||||
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)
|
||||
@ -4,6 +4,14 @@ let
|
||||
mkElectron = import ./generic.nix args;
|
||||
in
|
||||
{
|
||||
electron_3 = mkElectron "3.1.13" {
|
||||
x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
|
||||
x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx";
|
||||
i686-linux = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23";
|
||||
armv7l-linux = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa";
|
||||
aarch64-linux = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8";
|
||||
};
|
||||
|
||||
electron_4 = mkElectron "4.2.12" {
|
||||
x86_64-linux = "72c5319c92baa7101bea3254a036c0cd3bcf257f4a03a0bb153668b7292ee2dd";
|
||||
x86_64-darwin = "89b0e16bb9b7072ed7ed1906fccd08540acdd9f42dd8a29c97fa17d811b8c5e5";
|
||||
|
||||
@ -9989,9 +9989,7 @@ in
|
||||
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
|
||||
|
||||
inherit (callPackages ../development/tools/electron { })
|
||||
electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
|
||||
|
||||
electron_3 = callPackage ../development/tools/electron/3.x.nix { };
|
||||
electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
|
||||
electron = electron_4;
|
||||
|
||||
autobuild = callPackage ../development/tools/misc/autobuild { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user