alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #165111 from toonn/darwin-bundle-outputBin

Browse source 
make-darwin-bundle: Use output bin
This commit is contained in:
Lassulus 2022-04-22 12:04:09 +01:00 committed by GitHub
parent c542baa0c8 783eaf9980
commit 1468e8f52d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/build-support/make-darwin-bundle/default.nix
View file

@ -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"

8
pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
View file

@ -200,12 +200,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() {