mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge pull request #53480 from andrew-d/andrew/git-annex-darwin
gitAndTools.git-annex: wrap binary on not-Linux to use Nixpkgs' coreutils
This commit is contained in:
commit
9a32caa376
@ -544,6 +544,19 @@ self: super: builtins.intersectAttrs super {
|
||||
'';
|
||||
});
|
||||
|
||||
# On Darwin, git-annex mis-detects options to `cp`, so we wrap the binary to
|
||||
# ensure it uses Nixpkgs' coreutils.
|
||||
git-annex = with pkgs;
|
||||
if (!stdenv.isLinux) then
|
||||
let path = stdenv.lib.makeBinPath [ coreutils ];
|
||||
in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/git-annex \
|
||||
--prefix PATH : "${path}"
|
||||
'';
|
||||
})
|
||||
else super.git-annex;
|
||||
|
||||
# The test suite has undeclared dependencies on git.
|
||||
githash = dontCheck super.githash;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user