diff options
| author | Samuel Leathers <sam@appliedtrust.com> | 2017-08-21 08:32:47 -0400 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-22 03:14:50 +0200 |
| commit | 5404ac9ae00be305eb4dff926088a8113162d3e4 (patch) | |
| tree | ca820d1d58257bf5c4890e4401faa29d272eaf4a /pkgs/applications/editors | |
| parent | a4594e21a85bccae1e5c3cda424bb938826cc147 (diff) | |
| download | nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.tar nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.tar.gz nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.tar.bz2 nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.tar.lz nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.tar.xz nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.tar.zst nixlib-5404ac9ae00be305eb4dff926088a8113162d3e4.zip | |
atom: fixes #28436 - atom git integration
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 31e6476d282f..07728ed7f3be 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 |