From dab75ab44004a5e4e338e28c6a0b03c55b75515c Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 27 Oct 2015 04:02:12 -0400 Subject: [PATCH] atom: add gvfs/bin to wrapper PATH Atom deletes files by invoking `gvfs-trash`. Without it, deletions fail silently. --- pkgs/applications/editors/atom/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9bcad5b7649..052bfc4e373 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, xorg, libcap, systemd +, gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "${name}.deb"; }; - buildInputs = [ atomEnv makeWrapper ]; + buildInputs = [ atomEnv gvfs makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; @@ -41,7 +41,8 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/resources/app/apm/bin/node wrapProgram $out/bin/atom \ - --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" \ + --prefix "PATH" : "${gvfs}/bin" wrapProgram $out/bin/apm \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" '';