From a77d26b6571687b224b1f39501758f514ee0f919 Mon Sep 17 00:00:00 2001 From: "Travis B. Hartwell" Date: Fri, 19 Jun 2015 15:05:00 -0600 Subject: [PATCH 1/2] atom: update 0.187.0 -> 1.0.0 Added systemd to buildEnv path because of new dependency on libudev. --- pkgs/applications/editors/atom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 31142efcc89..dc7975f5dcd 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"; }; From fd4c675c7746e28d71e046e4c41b5ba1a585b21c Mon Sep 17 00:00:00 2001 From: "Travis B. Hartwell" Date: Fri, 19 Jun 2015 15:10:05 -0600 Subject: [PATCH 2/2] atom: update desktop file and remove unneeded lintian directory. --- pkgs/applications/editors/atom/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index dc7975f5dcd..fc2f9265ed6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -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