From 253b84a1eb2609ea7d71a236040515dc7c131b1b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 22 Apr 2016 17:44:30 +0300
Subject: [PATCH] vscode, electron, atom: run fixup phases

---
 pkgs/applications/editors/atom/default.nix   | 2 ++
 pkgs/applications/editors/vscode/default.nix | 2 +-
 pkgs/development/tools/electron/default.nix  | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 5cad049ba32..9a392b90dc1 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/atom \
       --prefix "PATH" : "${gvfs}/bin"
 
+    fixupPhase
+
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${atomEnv.libPath}:$out/share/atom" \
       $out/share/atom/atom
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 134dc397e06..b372dda1bf8 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -47,7 +47,7 @@ in
       cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
     '';
 
-    fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
+    postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 74adbb3f153..a3afc235a6c 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     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}:$out/lib/electron" \