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

qt515: fix on darwin #182035

Merged
merged 1 commit into from
Jul 19, 2022
Merged

qt515: fix on darwin #182035

merged 1 commit into from
Jul 19, 2022

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Jul 19, 2022

Description of changes
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/)
  • 22.11 Release Notes (or backporting 22.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.

@veprbl veprbl requested a review from ttuegel as a code owner July 19, 2022 03:09
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 19, 2022
@veprbl veprbl mentioned this pull request Jul 19, 2022
Closed
13 tasks
@ofborg ofborg bot requested review from bkchr, periklis and qknight July 19, 2022 03:18
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jul 19, 2022
K900
K900 approved these changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@K900 K900 left a comment

Choose a reason for hiding this comment

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

Other then that one nut LGTM

pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -195,7 +195,10 @@ stdenv.mkDerivation {
# ignore "is only available on macOS 10.12.2 or newer" in obj-c code
"-Wno-error=unguarded-availability"
]
++ lib.optionals withGtk3 [
++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [
Copy link
Contributor

Choose a reason for hiding this comment

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

versionGreater?

@K900
Copy link
Contributor

K900 commented Jul 19, 2022

@ofborg build libsForQt515.qtbase

@K900 K900 merged commit 4cf7078 into NixOS:staging-next Jul 19, 2022
@toonn
Copy link
Contributor

toonn commented Jul 19, 2022

Ah, just finished a nixpkgs-review >.<

Result of nixpkgs-review pr 182035 run on x86_64-darwin 1

1 package built:
  • libsForQt515.qtbase

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@K900 K900 K900 approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel

@bkchr bkchr Awaiting requested review from bkchr

@periklis periklis Awaiting requested review from periklis

@qknight qknight Awaiting requested review from qknight

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@veprbl @K900 @toonn