From a5d41a30e5f0b36dcf204cc461a413d8cfb9366b Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sun, 6 Jan 2019 00:53:21 -0500 Subject: [PATCH] gitAndTools.git-annex: wrap binary on not-Linux to use Nixpkgs' coreutils --- .../haskell-modules/configuration-nix.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f0d629ad5e44..d7292c66fb85 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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;