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

nixos/no-x-libs: fix build packages #258812

Merged
merged 2 commits into from
Dec 26, 2023
Merged

nixos/no-x-libs: fix build packages #258812

merged 2 commits into from
Dec 26, 2023

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Oct 3, 2023

Description of changes

Fix build packages with enabled option environment.noXlibs = true.

Things done

  • 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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

@Izorkin Izorkin requested review from SuperSandro2000, NickCao and RaitoBezarius and removed request for SuperSandro2000 October 3, 2023 14:49
@K900
Copy link
Contributor

K900 commented Oct 3, 2023

Pipewire rebuild needs to go into staging.

@Izorkin Izorkin marked this pull request as draft October 3, 2023 15:59
@Izorkin Izorkin changed the base branch from master to staging October 3, 2023 16:03
@Izorkin
Copy link
Contributor Author

Izorkin commented Oct 3, 2023

Pipewire rebuild needs to go into staging.

Ups.. Fixed.

@Izorkin Izorkin marked this pull request as ready for review October 3, 2023 16:03
SuperSandro2000
SuperSandro2000 reviewed Oct 3, 2023
View reviewed changes
nixos/modules/config/no-x-libs.nix Outdated
@@ -42,6 +42,7 @@ with lib;
gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; };
gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableX11 = false; };
};
gtk3 = super.gtk3.override { x11Support = false; waylandSupport = false; };
Copy link
Member

Choose a reason for hiding this comment

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

gtk3 is one of the dependencies we try to avoid and remove in many other packages in this list. What was your motivation to add this? We should probably remove the dependency from the package itself instead. Or in addition to this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I couldn't build the qemu package. Dependency chain - qemu -> pipewire -> ffado -> ... -> gtk3.

Copy link
Member

Choose a reason for hiding this comment

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

if we remove ffado from pipewire, then we don't need it the gtk3 overwrite here. Also this probably hides usages of gtk3 in the future. I think we should remove this line again.

@Izorkin Izorkin requested a review from ttuegel as a code owner October 4, 2023 12:01
@github-actions github-actions bot added 6.topic: python 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: rust 6.topic: fetch 6.topic: stdenv Standard environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: lua labels Dec 25, 2023
@github-actions github-actions bot removed 6.topic: python 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: rust 6.topic: fetch 6.topic: stdenv Standard environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: lua labels Dec 25, 2023
@Izorkin Izorkin marked this pull request as ready for review December 25, 2023 20:33
@Izorkin
Copy link
Contributor Author

Izorkin commented Dec 25, 2023

Update.

NickCao
NickCao approved these changes Dec 25, 2023
View reviewed changes
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 258812 run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools

0 rebuild, waiting for ofborg.

@NickCao
Copy link
Member

NickCao commented Dec 25, 2023

Is the pipewire test supposed to fail?

@Izorkin
Copy link
Contributor Author

Izorkin commented Dec 26, 2023

Without this PR, same error with pipewire test.

@SuperSandro2000
Copy link
Member

Also failed in #267862 but because of a different reason I think. Can't load the full log anymore.

@K900 what do you say?

@K900
Copy link
Contributor

K900 commented Dec 26, 2023

The VM test does fail, it needs a real ALSA device.

@NickCao NickCao merged commit 5cfba53 into NixOS:master Dec 26, 2023
23 checks passed
@Izorkin Izorkin deleted the fix-noxlibs branch December 26, 2023 18:11
@Izorkin
Copy link
Contributor Author

Izorkin commented Dec 26, 2023

Thanks!

@Ma27 Ma27 added the backport release-23.11 Backport PR automatically label Jan 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 5, 2024

Successfully created backport PR for release-23.11:

@github-actions github-actions bot mentioned this pull request Jan 5, 2024
Merged
1 task
@Ma27
Copy link
Member

Ma27 commented Jan 5, 2024

This fixes a config that broke on 23.11, but worked fine on 23.05 for a headless machine connected to a speaker (because of alsa-utils -> pipewire -> ... -> gtk3) and is only for the minimal profile relevant, so I'm scheduling this for a backport.

@Shawn8901 Shawn8901 mentioned this pull request Apr 16, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@NickCao NickCao NickCao approved these changes

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@dasj19 dasj19 Awaiting requested review from dasj19

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

@amaxine amaxine Awaiting requested review from amaxine

@K900 K900 Awaiting requested review from K900 K900 is a code owner

@Kranzes Kranzes Awaiting requested review from Kranzes

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: qt/kde 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12.approvals: 1 backport release-23.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Izorkin @K900 @nixos-discourse @SuperSandro2000 @NickCao @Ma27