1 files changed, 15 insertions, 35 deletions
diff --git a/nixpkgs/pkgs/applications/misc/obinskit/default.nix b/nixpkgs/pkgs/applications/misc/obinskit/default.nix
index aa11c069a7a8..bbaa135f47e1 100644
--- a/nixpkgs/pkgs/applications/misc/obinskit/default.nix
+++ b/nixpkgs/pkgs/applications/misc/obinskit/default.nix
@@ -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" ];
   };
 }