Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d6f752c51ee
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58ab75c63917
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 9, 2018

  1. atom: fix git integration (#40163)

    @ysndr @matthewbauer
    ysndr authored and matthewbauer committed May 9, 2018
    Copy the full SHA
    58ab75c View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/applications/editors/atom/default.nix
4 changes: 3 additions & 1 deletion pkgs/applications/editors/atom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];
};
}