From 5404ac9ae00be305eb4dff926088a8113162d3e4 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 21 Aug 2017 08:32:47 -0400 Subject: [PATCH] atom: fixes #28436 - atom git integration --- pkgs/applications/editors/atom/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 31e6476d282..07728ed7f3b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: stdenv.mkDerivation rec { name = "atom-${version}"; @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node + rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git + ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git + find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; paxmark m $out/share/atom/atom