diff options
| author | toonn <toonn@toonn.io> | 2022-03-10 13:27:29 +0100 |
|---|---|---|
| committer | toonn <toonn@toonn.io> | 2022-03-21 13:48:20 +0100 |
| commit | a8d7ac1b11b095563018c2855cc4289f763beb34 (patch) | |
| tree | fb36b2c368d3c8c0fc94d371782235dd2ebe9e50 /pkgs | |
| parent | e5e8e1d9263031e98e4e7c3ab73c409b2d5f82d1 (diff) | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/make-darwin-bundle/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 8 |
2 files changed, 8 insertions, 8 deletions
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" diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index b2e2738cb6ece..be63df9823175 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -154,12 +154,12 @@ convertDesktopFile() { local -r iconName=$(getDesktopParam "${file}" "^Icon") local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") - 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" - convertIconTheme "$out/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName" + convertIconTheme "${!outputBin}/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName" - write-darwin-bundle "$out" "$name" "$exec" "$iconName" "$squircle" + write-darwin-bundle "${!outputBin}" "$name" "$exec" "$iconName" "$squircle" } convertDesktopFiles() { |