darwin.installApplication + unpkg + unxar: init #147567
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spease
force-pushed
the
installApplication
branch
from
c835d68 to
0a8c91e
Compare
spease
changed the title
ofborg
bot
added
8.has: package (new)
Comment on lines
+3
to
+4
| xar --dump-header -f "${curSrc}" | grep -q "^magic:\s\+[0-9a-z]\+\s\+(OK)$" | ||
| [ $? -ne 0 ] && return 1 |
There was a problem hiding this comment.
Shouldn't set -e be set in the stdenv and this cleanly fail?
Suggested change
| xar --dump-header -f "${curSrc}" | grep -q "^magic:\s\+[0-9a-z]\+\s\+(OK)$" | |
| [ $? -ne 0 ] && return 1 | |
| xar --dump-header -f "${curSrc}" | grep -q "^magic:\s\+[0-9a-z]\+\s\+(OK)$" | |
| ret=$? | |
| [ $ret -ne 0 ] && return $ret |
I think we should preserve the exit code.
|
|
||
| installPhase = '' | ||
| mkdir -p $out/bin | ||
| ln -s $(command -v xar) $out/bin/xar |
There was a problem hiding this comment.
Suggested change
| ln -s $(command -v xar) $out/bin/xar | |
| ln -s ${xar}/bin/xar $out/bin/xar |
| dir="$(mktemp -d)" | ||
| xar -xf "${curSrc}" -C "${dir}" | ||
| zcat ${dir}/*/Payload | cpio -idm --no-absolute-filenames | ||
| rm -rf --preserve-root "${dir}" |
There was a problem hiding this comment.
Suggested change
| rm -rf --preserve-root "${dir}" | |
| rm -rf "$dir" |
This should be the default and also mktemp should never output /.
|
|
||
| installPhase = '' | ||
| mkdir -p $out/bin | ||
| ln -s $(command -v xar) $out/bin/xar |
There was a problem hiding this comment.
Suggested change
| ln -s $(command -v xar) $out/bin/xar | |
| ln -s ${xar}/bin/xar $out/bin/xar |
| description = description; | ||
| homepage = homepage; | ||
| license = licenses."${license}"; | ||
| maintainers = forEach maintainers (x: maintainers."${maintainer}"); |
There was a problem hiding this comment.
This is not how this is normally done. Normally meta is just inherited as is or the inputs override some defaults.
Comment on lines
+15
to
+16
| phases = [ "unpackPhase" "installPhase" ]; | ||
|
|
There was a problem hiding this comment.
Suggested change
| phases = [ "unpackPhase" "installPhase" ]; |
Please disable unwanted phases with dontBuild = true;.
stale
bot
added
the
2.status: stale
wegank
added
the
2.status: merge conflict
stale
bot
removed
the
2.status: stale
wegank
added
the
2.status: stale
stale
bot
removed
the
2.status: stale
19 tasks
wegank
added
the
2.status: stale
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Greatly improve ease-of-use for developing nix derivations on macOS, particularly with regards to desktop applications packaged in the typical conventions expected for non-store installation. This is intended to be an "easy path" that's as simple and minimal as possible - if someone wants to get fancy and deal with a nonstandard or more complex application, that is outside the scope of this.
This is intended to get used by as many packages as possible to rapidly increase the number of native macOS applications available under nix, perhaps even by nix newbies, so please be as critical as possible. Once merged, the interface and behavior should remain as static as possible, as later changes could require multiple packages to be refactored.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notesExample of usage