summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorYannik Sander <ysndr@users.noreply.github.com>2018-05-10 01:34:57 +0200
committerMatthew Justin Bauer <mjbauer95@gmail.com>2018-05-09 18:34:57 -0500
commit58ab75c63917f9c09df1063d549344b892ab569a (patch)
tree5f0d42da687b5162e6c2f0fb8adcf47bb3e0921e /pkgs/applications/editors
parent3d6f752c51ee69aa508995db509c5c70b1253f8f (diff)
downloadnixlib-58ab75c63917f9c09df1063d549344b892ab569a.tar
nixlib-58ab75c63917f9c09df1063d549344b892ab569a.tar.gz
nixlib-58ab75c63917f9c09df1063d549344b892ab569a.tar.bz2
nixlib-58ab75c63917f9c09df1063d549344b892ab569a.tar.lz
nixlib-58ab75c63917f9c09df1063d549344b892ab569a.tar.xz
nixlib-58ab75c63917f9c09df1063d549344b892ab569a.tar.zst
nixlib-58ab75c63917f9c09df1063d549344b892ab569a.zip
atom: fix git integration (#40163)
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/atom/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index ca223803f04d..f646fab86294 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
     rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
     ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+    rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
+    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
 
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
 
@@ -45,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
     license = licenses.mit;
-    maintainers = [ maintainers.offline maintainers.nequissimus ];
+    maintainers = [ maintainers.offline maintainers.nequissimus maintainers.ysndr ];
     platforms = [ "x86_64-linux" ];
   };
 }