From fb063991b26b2b93dece6d09f37041451a5ef4cb Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Tue, 1 Dec 2020 19:11:45 +0100
Subject: [PATCH] macdylibbundler: Should propagate dependency on otool
 (#103163)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/tools/misc/macdylibbundler/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix
index 103c534dfa3d..5008175363cb 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, makeWrapper, fetchFromGitHub, cctools }:
 
 stdenv.mkDerivation {
   pname = "macdylibbundler";
@@ -11,8 +11,15 @@ stdenv.mkDerivation {
     sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj";
   };
 
+  buildInputs = [ makeWrapper ];
+
   makeFlags = [ "PREFIX=$(out)" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/dylibbundler \
+      --prefix PATH ":" "${cctools}/bin"
+  '';
+
   meta = with stdenv.lib; {
     description = "Utility to ease bundling libraries into executables for OSX";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cfcb9b4abfb..c0c827bc13b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22390,7 +22390,7 @@ in
 
   mac = callPackage ../development/libraries/mac { };
 
-  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
+  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; };
 
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;