From dc2a4e20976243700e5d684d51e84ec4098c5fb4 Mon Sep 17 00:00:00 2001
From: mucaho <mkucko@gmail.com>
Date: Mon, 4 Apr 2016 17:11:41 +0100
Subject: [PATCH] electron: abstract out atom-env

---
 pkgs/development/tools/electron/default.nix  | 25 ++++++--------------
 pkgs/development/tools/electron/env-atom.nix | 17 +++++++++++++
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/tools/electron/env-atom.nix

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index aae4b413c3d..d7d338f7f60 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,27 +1,16 @@
-{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib
-, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip
-, systemd, libnotify
-, version ? "0.36.2", sha256 ? "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d", ...
-}:
+{ stdenv, callPackage, fetchurl, unzip
+, ...
+} @ args:
+
 let
-  atomEnv = 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
-    ];
-  };
+  atomEnv = callPackage ./env-atom.nix (args);
 in stdenv.mkDerivation rec {
   name = "electron-${version}";
-  inherit version;
+  version = "0.36.2";
 
   src = fetchurl {
     url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-    inherit sha256;
+    sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
     name = "${name}.zip";
   };
 
diff --git a/pkgs/development/tools/electron/env-atom.nix b/pkgs/development/tools/electron/env-atom.nix
new file mode 100644
index 00000000000..6c69b2e52cc
--- /dev/null
+++ b/pkgs/development/tools/electron/env-atom.nix
@@ -0,0 +1,17 @@
+{ 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
+  ];
+}