git.iko.soy/typeable/nixpkgs
on master help sign in
obinskit: update to new electron_3 packaging
commit8247dc86db786104543cc701bf4407497fce429d authorPavol Rusnak <pavol@rusnak.io> dateMon 27 Apr 2020, 22:23 (7 years ago) parent6e41b08
1 file changed+15−35
pkgs/applications/misc/obinskit/default.nix+15−35
pkgs/applications/misc/obinskit/default.nix+15−35
@@ -1,33 +1,24 @@
1−{ lib
2−, stdenv
1+{ stdenv
32, fetchurl
4−, xorg
53, libxkbcommon
64, systemd
7−, gcc-unwrapped
5+, xorg
86, electron_3
9−, wrapGAppsHook
7+, makeWrapper
108, makeDesktopItem
119}:
12−
1310let
14− libPath = lib.makeLibraryPath [
15− libxkbcommon
16− xorg.libXt
17− systemd.lib
18− stdenv.cc.cc.lib
19− ];
20−
2111 desktopItem = makeDesktopItem rec {
2212 name = "Obinskit";
2313 exec = "obinskit";
24− icon = "obinskit.png";
14+ icon = "obinskit";
2515 desktopName = "Obinskit";
2616 genericName = "Obinskit keyboard configurator";
2717 categories = "Utility";
2818 };
2919
30−in stdenv.mkDerivation rec {
20+in
21+stdenv.mkDerivation rec {
3122 pname = "obinskit";
3223 version = "1.1.4";
3324
@@ -40,44 +31,33 @@ in stdenv.mkDerivation rec {
4031
4132 sourceRoot = "ObinsKit_${version}_x64";
4233
43− nativeBuildInputs = [ wrapGAppsHook ];
34+ nativeBuildInputs = [ makeWrapper ];
4435
4536 dontConfigure = true;
4637 dontBuild = true;
4738
4839 installPhase = ''
4940 mkdir -p $out/opt/obinskit
50− install icudtl.dat $out/opt/obinskit/
51− install natives_blob.bin $out/opt/obinskit/
52− install v8_context_snapshot.bin $out/opt/obinskit/
53− install blink_image_resources_200_percent.pak $out/opt/obinskit/
54− install content_resources_200_percent.pak $out/opt/obinskit/
55− install content_shell.pak $out/opt/obinskit/
56− install ui_resources_200_percent.pak $out/opt/obinskit/
57− install views_resources_200_percent.pak $out/opt/obinskit/
41+
5842 cp -r resources $out/opt/obinskit/
5943 cp -r locales $out/opt/obinskit/
6044
61− mkdir -p $out/bin
62− ln -s ${electron_3}/bin/electron $out/bin/obinskit
63−
6445 mkdir -p $out/share/{applications,pixmaps}
6546 install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png
6647 ln -s ${desktopItem}/share/applications/* $out/share/applications
6748 '';
6849
69− preFixup = ''
70− gappsWrapperArgs+=(
71− --add-flags $out/opt/obinskit/resources/app.asar
72− --prefix LD_LIBRARY_PATH : "${libPath}"
73− )
50+ postFixup = ''
51+ makeWrapper ${electron_3}/bin/electron $out/bin/${pname} \
52+ --add-flags $out/opt/obinskit/resources/app.asar \
53+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
7454 '';
7555
76− meta = with lib; {
56+ meta = with stdenv.lib; {
7757 description = "Graphical configurator for Anne Pro and Anne Pro II keyboards";
78− homepage = "http://en.obins.net/obinskit/";
58+ homepage = "http://en.obins.net/obinskit/"; # https is broken
7959 license = licenses.unfree;
80− maintainers = [ maintainers.shou ];
60+ maintainers = with maintainers; [ shou ];
8161 platforms = [ "x86_64-linux" ];
8262 };
8363}