public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2

Browse Source 
Added systemd to buildEnv path because of new libudev dependency.
This commit is contained in:
Travis B. Hartwell 2015-06-19 15:17:00 -06:00
parent 7720c7d75f
commit caa216b640
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/release-notes/rl-unstable.xml
View File

@ -59,6 +59,10 @@ and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
was accordingly renamed to <literal>bomi</literal> was accordingly renamed to <literal>bomi</literal>
</para></listitem> </para></listitem>
<listitem><para>Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal>
was accordingly renamed to <literal>electron</literal>
</para></listitem>
<listitem> <listitem>
<para> <para>
The default <literal>NIX_PATH</literal> for NixOS now includes The default <literal>NIX_PATH</literal> for NixOS now includes

18
pkgs/development/tools/atom-shell/default.nix → pkgs/development/tools/electron/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip
, systemd
}: }:
let let
atomEnv = buildEnv { atomEnv = buildEnv {
@ -10,16 +11,16 @@ let
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
xlibs.libXcursor libcap xlibs.libXcursor libcap systemd
]; ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "atom-shell-${version}"; name = "electron-${version}";
version = "0.19.1"; version = "0.28.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip"; url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y"; sha256 = "55b0880e2f78a60d95a58e83cd75006c34cb6ed90836e1f34e3359c3e5d0b8f0";
name = "${name}.zip"; name = "${name}.zip";
}; };
@ -33,15 +34,14 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
unzip -d $out/bin $src unzip -d $out/bin $src
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/bin/atom $out/bin/electron
mv $out/bin/atom $out/bin/atom-shell wrapProgram $out/bin/electron \
wrapProgram $out/bin/atom-shell \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross platform desktop application shell"; description = "Cross platform desktop application shell";
homepage = https://github.com/atom/atom-shell; homepage = https://github.com/atom/electron;
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.fluffynukeit ]; maintainers = [ maintainers.fluffynukeit ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];

2
pkgs/top-level/all-packages.nix
View File

@ -5143,7 +5143,7 @@ let
astyle = callPackage ../development/tools/misc/astyle { }; astyle = callPackage ../development/tools/misc/astyle { };
atom-shell = callPackage ../development/tools/atom-shell { electron = callPackage ../development/tools/electron {
gconf = pkgs.gnome.GConf; gconf = pkgs.gnome.GConf;
}; };