diff options
author | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-07-02 11:37:33 +0200 |
---|---|---|
committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-07-02 11:37:33 +0200 |
commit | 27e0488e112591c7b3743daeac06f9e8aee0a439 (patch) | |
tree | 38a46d250b5bbe929b2713c7cebffbcf0b9d102e /pkgs/applications/editors | |
parent | afa1f5ba2220203166a1f67113370327d285b63d (diff) | |
parent | fd4c675c7746e28d71e046e4c41b5ba1a585b21c (diff) | |
download | nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.tar nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.tar.gz nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.tar.bz2 nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.tar.lz nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.tar.xz nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.tar.zst nixpkgs-27e0488e112591c7b3743daeac06f9e8aee0a439.zip |
Merge pull request #8421 from travisbhartwell/update/atom
atom: 0.187.0 -> 1.0.0
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/atom/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 31142efcc89..fc2f9265ed6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd }: let @@ -11,16 +11,16 @@ let fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap + xlibs.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.187.0"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0s6173dg5m52zc8kqwlgjn113d84cskrv9v29fb0nrvwvkv2xzmw"; + sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e"; name = "${name}.deb"; }; @@ -31,7 +31,10 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out ar p $src data.tar.gz | tar -C $out -xz ./usr + substituteInPlace $out/usr/share/applications/atom.desktop \ + --replace /usr/share/atom $out/bin mv $out/usr/* $out/ + rm -r $out/share/lintian rm -r $out/usr/ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/atom |