Skip to content

dbus: fix static build#147429

Merged
Ma27 merged 2 commits intoNixOS:stagingfrom
SCOTT-HAMILTON:dbus
Nov 28, 2021
Merged

dbus: fix static build#147429
Ma27 merged 2 commits intoNixOS:stagingfrom
SCOTT-HAMILTON:dbus

Conversation

@SCOTT-HAMILTON
Copy link
Contributor

@SCOTT-HAMILTON SCOTT-HAMILTON commented Nov 25, 2021 •
edited
Loading

Motivation for this change

Part of a bigger project to build Qt 5 statically #136107.

Things done

Fixed the build of pkgsStatic.dbus and pkgsStatic.util-linux.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from jtojnar November 25, 2021 23:23
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 25, 2021
jtojnar
jtojnar requested changes Nov 25, 2021
View reviewed changes
@Mindavi Mindavi added the 6.topic: static Static builds (e.g. pkgsStatic) label Nov 26, 2021
@ofborg ofborg bot requested a review from jtojnar November 26, 2021 13:58
@SCOTT-HAMILTON
Copy link
Contributor Author

SCOTT-HAMILTON commented Nov 26, 2021

Sorry for the duplicate answers, github glitched.

@SCOTT-HAMILTON SCOTT-HAMILTON changed the base branch from master to staging November 26, 2021 15:39
jtojnar
jtojnar reviewed Nov 26, 2021
View reviewed changes
@ofborg ofborg bot requested a review from jtojnar November 26, 2021 16:43
jtojnar
jtojnar reviewed Nov 26, 2021
View reviewed changes
@ofborg ofborg bot requested a review from jtojnar November 26, 2021 17:00
jtojnar
jtojnar reviewed Nov 26, 2021
View reviewed changes
@ofborg ofborg bot requested a review from jtojnar November 26, 2021 17:21
jtojnar
jtojnar approved these changes Nov 26, 2021
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both dbus and pkgsStatic.dbus build now, now outdated substitutes.

@ofborg ofborg bot requested a review from jtojnar November 26, 2021 19:32
@Ma27 Ma27 merged commit 508d769 into NixOS:staging Nov 28, 2021
@alyssais alyssais mentioned this pull request Dec 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@kalbasit kalbasit Awaiting requested review from kalbasit

@marsam marsam Awaiting requested review from marsam

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92

@stigtsp stigtsp Awaiting requested review from stigtsp

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@ttuegel ttuegel Awaiting requested review from ttuegel

@zakame zakame Awaiting requested review from zakame

@zowoq zowoq Awaiting requested review from zowoq

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees

No one assigned

Labels

6.topic: static Static builds (e.g. pkgsStatic) 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@SCOTT-HAMILTON @jtojnar @Ma27 @Mindavi