pyrox.dev
Merge pull request #165111 from toonn/darwin-bundle-outputBin
make-darwin-bundle: Use output bin
+4
-4
pkgs/build-support/make-darwin-bundle/default.nix
+4
-4
pkgs/build-support/make-darwin-bundle/default.nix
···
12
13
writeShellScript "make-darwin-bundle-${name}" (''
14
function makeDarwinBundlePhase() {
15
-
mkdir -p "$out/Applications/${name}.app/Contents/MacOS"
16
-
mkdir -p "$out/Applications/${name}.app/Contents/Resources"
17
18
if [ -n "${icon}" ]; then
19
-
ln -s "${icon}" "$out/Applications/${name}.app/Contents/Resources"
20
fi
21
22
-
${writeDarwinBundle}/bin/write-darwin-bundle "$out" "${name}" "${exec}"
23
}
24
25
preDistPhases+=" makeDarwinBundlePhase"
···
12
13
writeShellScript "make-darwin-bundle-${name}" (''
14
function makeDarwinBundlePhase() {
15
+
mkdir -p "''${!outputBin}/Applications/${name}.app/Contents/MacOS"
16
+
mkdir -p "''${!outputBin}/Applications/${name}.app/Contents/Resources"
17
18
if [ -n "${icon}" ]; then
19
+
ln -s "${icon}" "''${!outputBin}/Applications/${name}.app/Contents/Resources"
20
fi
21
22
+
${writeDarwinBundle}/bin/write-darwin-bundle "''${!outputBin}" "${name}" "${exec}"
23
}
24
25
preDistPhases+=" makeDarwinBundlePhase"
+4
-4
pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
+4
-4
pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
···
200
local -r iconName=$(getDesktopParam "${file}" "^Icon")
201
local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon")
202
203
-
mkdir -p "$out/Applications/${name}.app/Contents/MacOS"
204
-
mkdir -p "$out/Applications/${name}.app/Contents/Resources"
205
206
-
convertIconTheme "$out/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName"
207
208
-
write-darwin-bundle "$out" "$name" "$exec" "$iconName" "$squircle"
209
}
210
211
convertDesktopFiles() {
···
200
local -r iconName=$(getDesktopParam "${file}" "^Icon")
201
local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon")
202
203
+
mkdir -p "${!outputBin}/Applications/${name}.app/Contents/MacOS"
204
+
mkdir -p "${!outputBin}/Applications/${name}.app/Contents/Resources"
205
206
+
convertIconTheme "${!outputBin}/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName"
207
208
+
write-darwin-bundle "${!outputBin}" "$name" "$exec" "$iconName" "$squircle"
209
}
210
211
convertDesktopFiles() {