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/build-support/setup-hooks/desktop-to-darwin-bundle.sh | |
| parent | e5e8e1d9263031e98e4e7c3ab73c409b2d5f82d1 (diff) | |
| download | nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.tar nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.tar.gz nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.tar.bz2 nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.tar.lz nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.tar.xz nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.tar.zst nixpkgs-a8d7ac1b11b095563018c2855cc4289f763beb34.zip | |
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/build-support/setup-hooks/desktop-to-darwin-bundle.sh')
| -rw-r--r-- | pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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 b2e2738cb6e..be63df98231 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() { |