rpm: Add Darwin support #35142
Merged
rpm: Add Darwin support #35142
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
|
BTW, the missing files for qemu were added in e3f947a. |
|
@grahamc ^ Possible @GrahamcOfBorg's bug -- how does it determine when the change is Darwin-specific? |
|
Yeah, I have a pr open for that. |
|
The |
|
I don't understand the error in the checker. Can someone help with that? |
vcunat
reviewed
Feb 19, 2018
| @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { | |||
| buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; | |||
|
|
|||
| # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements | |||
| propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive libbfd ]; | |||
| propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] | |||
| ++ stdenv.lib.optionals stdenv.isLinux elfutils; | |||
There was a problem hiding this comment.
The checker marks line 21. optionals takes a list as the second parameter, so either use a singleton list or optional instead.
GrahamcOfBorg
added
8.has: package (new)
10.rebuild-darwin: 1-10
10.rebuild-linux: 11-100
and removed
6.topic: darwin
LnL7
reviewed
Feb 19, 2018
| @@ -52,13 +53,20 @@ stdenv.mkDerivation rec { | |||
| # symlinks produced by build are incorrect | |||
| ln -sf $out/bin/{rpm,rpmquery} | |||
| ln -sf $out/bin/{rpm,rpmverify} | |||
| '' + stdenv.lib.optionalString stdenv.isDarwin '' | |||
| cd $out/bin | |||
| ln -s "${nss}/lib/libnss3.dylib" | |||
There was a problem hiding this comment.
I would prefer to fix the install_name of these libraries, everything that depends on them is going to have this problem otherwise.
There was a problem hiding this comment.
That sounds right. I wasn't sure if there is a reason for them to have this problem. New to Nix so didn't want to assume. Should they be their own issues / PR's?
There was a problem hiding this comment.
You can add it to this pr if you want, just try to keep the changes in a separate commit per package.
GrahamcOfBorg
added
10.rebuild-darwin: 11-100
10.rebuild-linux: 101-500
and removed
6.topic: darwin
|
@GrahamcOfBorg build rpm |
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
LnL7
reviewed
Feb 20, 2018
| @@ -33,6 +33,10 @@ in stdenv.mkDerivation rec { | |||
|
|
|||
| patchFlags = "-p0"; | |||
|
|
|||
| postPatch = stdenv.lib.optionalString stdenv.isDarwin '' | |||
| substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" | |||
There was a problem hiding this comment.
does this work correctly if you need to fixup the install_name afterwards anyway?
There was a problem hiding this comment.
Yes. It fixes a part of the paths. I couldn’t fix them all in the build. So I ended up hacking the rest with install_name_tool.
There was a problem hiding this comment.
ah, in that case take a look at fixDarwinDylibNames, that should handle the fixup for you. (the second part)
There was a problem hiding this comment.
Thanks. Didn't notice that when grepping around.
|
@GrahamcOfBorg build rpm |
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
|
Thanks! |
|
I’m really new at Nix. Just trying it out. You were one of the most helpful and active reviewers I’ve seen. Thanks for all the help with this PR. |
|
Welcome! Darwin really lacks contributors, compared to x86_64-linux. |
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
RPM didn't work on macOS, now it does.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)Could not run nox-phase because
.nox/nixpkgs/pkgs/applications/virtualization/qemu/statfs-flags.patchwas missing. Shouldn't break Linux packages as the derivation is the same on Linux.I'm new to Nix so the "ln -s" solution in this PR might not be the best solution. It was used in other derivations so I picked it. The problem was that rpm tools pointed to
@execution_path/libnss3.dylib, but I could not fix that withinstall_name_toolbecausenssitself had more of those paths.