atom: 0.99.0 -> 0.129.0
[Bjørn Forsman: include fixupPhase, to fix this startup error on NixOS: $ ./result/bin/atom ./result/bin/atom: /nix/store/q3r5ww6pg5yb4j6p0d8inrhbgzmik0b6-atom-0.129.0/bin/.atom-wrapped: /bin/bash: bad interpreter: No such file or directory ]
This commit is contained in:
parent
6dfb6e5426
commit
3b45556a3b
@ -1,6 +1,6 @@
|
|||||||
{ 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
|
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -10,52 +10,35 @@ let
|
|||||||
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
|
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
|
||||||
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.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
|
||||||
|
xlibs.libXcursor libcap
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "atom-${version}";
|
name = "atom-${version}";
|
||||||
version = "0.99.0";
|
version = "0.129.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = https://github.com/hotice/webupd8/raw/master/atom-linux64-0.99.0~git20140525.tar.xz;
|
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
|
||||||
sha256 = "55c2415c96e1182ae1517751cbea1db64e9962683b384cfe5e182aec10aebecd";
|
sha256 = "0a78cb7e74b75b5c1cdbdfdea3f56ecab9479e407575b1e3cfb10c0d3265e7a4";
|
||||||
name = "${name}.tar.xz";
|
name = "${name}.deb";
|
||||||
};
|
|
||||||
|
|
||||||
iconsrc = fetchurl {
|
|
||||||
url = https://raw.githubusercontent.com/atom/atom/master/resources/atom.png;
|
|
||||||
sha256 = "66dc0b432eed7bcd738b7c1b194e539178a83d427c78f103041981f2b840e030";
|
|
||||||
};
|
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
|
||||||
name = "atom";
|
|
||||||
exec = "atom";
|
|
||||||
icon = iconsrc;
|
|
||||||
comment = "A hackable text editor for the 21st Century";
|
|
||||||
desktopName = "Atom";
|
|
||||||
genericName = "Text editor";
|
|
||||||
categories = "Development;TextEditor";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ atomEnv makeWrapper ];
|
buildInputs = [ atomEnv makeWrapper ];
|
||||||
|
|
||||||
phases = [ "installPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/atom
|
mkdir -p $out
|
||||||
mkdir -p $out/bin
|
ar p $src data.tar.gz | tar -C $out -xz ./usr
|
||||||
tar -C $out/share/atom -xvf $src
|
mv $out/usr/* $out/
|
||||||
|
rm -r $out/usr/
|
||||||
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||||
$out/share/atom/atom
|
$out/share/atom/atom
|
||||||
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||||
$out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node
|
$out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node
|
||||||
makeWrapper $out/share/atom/atom $out/bin/atom \
|
wrapProgram $out/bin/atom \
|
||||||
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
|
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
|
||||||
|
|
||||||
# Create a desktop item.
|
|
||||||
mkdir -p "$out/share/applications"
|
|
||||||
cp "${desktopItem}"/share/applications/* "$out/share/applications/"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user