From a8d7ac1b11b095563018c2855cc4289f763beb34 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 10 Mar 2022 13:27:29 +0100 Subject: make-darwin-bundle: Use actual bin output The script and the hook assume `/bin` is in `$out` but that's not always true for a multi-output derivation. --- pkgs/build-support/make-darwin-bundle/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/build-support/make-darwin-bundle') diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/build-support/make-darwin-bundle/default.nix index b8f58882fff32..60a89aa3a1880 100644 --- a/pkgs/build-support/make-darwin-bundle/default.nix +++ b/pkgs/build-support/make-darwin-bundle/default.nix @@ -12,14 +12,14 @@ writeShellScript "make-darwin-bundle-${name}" ('' function makeDarwinBundlePhase() { - mkdir -p "$out/Applications/${name}.app/Contents/MacOS" - mkdir -p "$out/Applications/${name}.app/Contents/Resources" + mkdir -p "${!outputBin}/Applications/${name}.app/Contents/MacOS" + mkdir -p "${!outputBin}/Applications/${name}.app/Contents/Resources" if [ -n "${icon}" ]; then - ln -s "${icon}" "$out/Applications/${name}.app/Contents/Resources" + ln -s "${icon}" "${!outputBin}/Applications/${name}.app/Contents/Resources" fi - ${writeDarwinBundle}/bin/write-darwin-bundle "$out" "${name}" "${exec}" + ${writeDarwinBundle}/bin/write-darwin-bundle "${!outputBin}" "${name}" "${exec}" } preDistPhases+=" makeDarwinBundlePhase" -- cgit 1.4.1