diff options
| author | mucaho <mkucko@gmail.com> | 2016-04-04 17:11:41 +0100 |
|---|---|---|
| committer | mucaho <mkucko@gmail.com> | 2016-04-04 17:34:07 +0100 |
| commit | dc2a4e20976243700e5d684d51e84ec4098c5fb4 (patch) | |
| tree | 3c99b8d58d6088c3544a49aa6ddd5eb09eb54375 /pkgs/development/tools/electron | |
| parent | c5741f5f52247e871e9615ecbd024dd3aafd2548 (diff) | |
| download | nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.tar nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.tar.gz nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.tar.bz2 nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.tar.lz nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.tar.xz nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.tar.zst nixlib-dc2a4e20976243700e5d684d51e84ec4098c5fb4.zip | |
electron: abstract out atom-env
Diffstat (limited to 'pkgs/development/tools/electron')
| -rw-r--r-- | pkgs/development/tools/electron/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/env-atom.nix | 17 |
2 files changed, 24 insertions, 18 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index aae4b413c3d9..d7d338f7f60e 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 000000000000..6c69b2e52ccb --- /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 + ]; +} |