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

systemd: fix pc files #106044

Merged
merged 1 commit into from Dec 8, 2020
Merged

systemd: fix pc files #106044

merged 1 commit into from Dec 8, 2020

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 6, 2020 •
edited

upstream decided to make this non-configurable... Lets' revert to the
version before.

Motivation for this change

#102355 (comment)
#105850 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 mentioned this pull request Dec 6, 2020
Merged
@ofborg ofborg bot requested review from flokli, andir and edolstra December 6, 2020 07:54
@Mic92
systemd: fix pc files
74f96a5 
upstream decided to make this non-configurable... Lets' revert to the
version before.
flokli
flokli reviewed Dec 6, 2020
View reviewed changes
pkgs/os-specific/linux/systemd/0019-Revert-pkg-config-prefix-is-not-really-configurable-.patch
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6e65df89c348242dbd10036abc7dd5e8181cf733.
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd appreciate if we could add at least the context from our issue here, so we can still reason about this in some weeks ;-)

Also, we should open an upstream issue and link to it (or even a PR with a commit message suitable for upstream), and link to it.

@lukegb lukegb mentioned this pull request Dec 7, 2020
Merged
10 tasks
@arianvp
Copy link
Member

arianvp commented Dec 7, 2020

Heh so Lennart actually asked our feedback before making this regression and I wrongfully assumed we only used the libsystemd.pc file (which does preserves the prefix) and thus this change would be safe to merge... I'm sorry :(

This means there might be some goodwill to undo this change upstream if we argue for it loudly enough.

But the patch is small so I'm ok carrying it in our tree to unblock ourselves.

I'll get a link to the original discussion

@FRidh FRidh added this to WIP in Staging via automation Dec 8, 2020
@flokli flokli mentioned this pull request Dec 8, 2020
Closed
@flokli
Copy link
Contributor

flokli commented Dec 8, 2020

We opened #106351 to get back to upstream on the breakage. Let's merge this now to unbreak staging.

@flokli flokli merged commit 3b41567 into NixOS:staging Dec 8, 2020
Staging automation moved this from WIP to Done Dec 8, 2020
@flokli flokli added this to To Do in systemd via automation Dec 8, 2020
@flokli flokli moved this from To Do to Done in systemd Dec 8, 2020
@Mic92 Mic92 deleted the systemd branch December 8, 2020 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli left review comments

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
Staging
  
Done
systemd
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Mic92 @arianvp @flokli