Merge commit 'refs/pull/14891/head' of git://github.com/NixOS/nixpkgs

pkgs/development/tools/electron/default.nix

@@ -1,10 +1,6 @@
-{ stdenv, callPackage, fetchurl, unzip
-, ...
-} @ args:
+{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
 
-let
-  atomEnv = callPackage ./env-atom.nix (args);
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "electron-${version}";
   version = "0.36.2";
 
@@ -14,23 +10,17 @@ in stdenv.mkDerivation rec {
     name = "${name}.zip";
   };
 
-  buildInputs = [ atomEnv unzip ];
+  buildInputs = [ unzip ];
 
-  phases = [ "installPhase" "fixupPhase" ];
+  buildCommand = ''
+    mkdir -p $out/lib/electron $out/bin
+    unzip -d $out/lib/electron $src
+    ln -s $out/lib/electron/electron $out/bin
 
-  unpackCmd = "unzip";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    unzip -d $out/bin $src
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-    $out/bin/electron
-  '';
-
-  postFixup = ''
     patchelf \
-    --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/electron)" \
-    $out/bin/electron
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
+      $out/lib/electron/electron
   '';
 
   meta = with stdenv.lib; {

pkgs/development/tools/electron/env-atom.nix

@@ -1,17 +0,0 @@
-{ stdenv, buildEnv, zlib, glib, alsaLib
-, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap
-, systemd, libnotify
-, ...
-}:
-
-buildEnv {
-  name = "env-atom";
-  paths = [
-    stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
-    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
-    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
-    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-    xorg.libXcursor libcap systemd libnotify
-  ];
-}