Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

udisks2: revive musl patching #42568

Merged
merged 1 commit into from Jun 25, 2018
Merged

udisks2: revive musl patching #42568

merged 1 commit into from Jun 25, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 25, 2018

I believe we discussed this and believed this wasn't necessary,
but without it the build breaks w/musl so re-add it.

Fix udisks2 build w/musl after update to 2.7.6 :).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@dtzWill
udisks2: revive musl patching
d94d3b3 
I believe we discussed this and believed this wasn't necessary,
but without it the build breaks w/musl so re-add it.
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: udisks2

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: udisks2

Partial log (click to expand)

checking for references to /build in /nix/store/qm2cn37sa1l6n58djd3a38x24dkvvhfr-udisks-2.7.6-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/9phyvn17a3k5ana8l10vg822jpxnnal2-udisks-2.7.6-dev
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/9phyvn17a3k5ana8l10vg822jpxnnal2-udisks-2.7.6-dev/lib
patching script interpreter paths in /nix/store/9phyvn17a3k5ana8l10vg822jpxnnal2-udisks-2.7.6-dev
checking for references to /build in /nix/store/9phyvn17a3k5ana8l10vg822jpxnnal2-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/f0wc5fwrdw6a9vfmjsxsxx446yr7q78z-udisks-2.7.6-devdoc
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/f0wc5fwrdw6a9vfmjsxsxx446yr7q78z-udisks-2.7.6-devdoc
checking for references to /build in /nix/store/f0wc5fwrdw6a9vfmjsxsxx446yr7q78z-udisks-2.7.6-devdoc...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: udisks2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/sir88p55qjs62j3rihi4ma714i7ahjls-udisks-2.7.6-dev
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/sir88p55qjs62j3rihi4ma714i7ahjls-udisks-2.7.6-dev/lib
patching script interpreter paths in /nix/store/sir88p55qjs62j3rihi4ma714i7ahjls-udisks-2.7.6-dev
checking for references to /build in /nix/store/sir88p55qjs62j3rihi4ma714i7ahjls-udisks-2.7.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/siyq4z6hkj31l2kiw4l8djxz71sn530b-udisks-2.7.6-devdoc
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/siyq4z6hkj31l2kiw4l8djxz71sn530b-udisks-2.7.6-devdoc
checking for references to /build in /nix/store/siyq4z6hkj31l2kiw4l8djxz71sn530b-udisks-2.7.6-devdoc...
/nix/store/mq5hrzsc7v314yckbz79f4ijmysyf4il-udisks-2.7.6

@dtzWill dtzWill merged commit a1fce4d into NixOS:master Jun 25, 2018
@dtzWill dtzWill deleted the fix/udisks2-musl-2.7.6-extend-glibc-fix-to-musl-too branch June 25, 2018 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @GrahamcOfBorg