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

qt5: install pkg_config files on darwin #35349

Merged
merged 1 commit into from Feb 26, 2018
Merged

qt5: install pkg_config files on darwin #35349

merged 1 commit into from Feb 26, 2018

Conversation

matthewbauer
Copy link
Member

Fixes #31685

This patch is applied in Homebrew here and looks to have worked for
them:

https://github.com/Homebrew/homebrew-core/blob/fafbdbd237ee87fb49b1080821e2597b38ff521c/Formula/qt.rb#L33-L44

I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).

Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.

This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.

@matthewbauer
qt5: install pkg_config files on darwin
a98a767 
Fixes NixOS#31685

This patch is applied in Homebrew here and looks to have worked for
them:

https://github.com/Homebrew/homebrew-core/blob/fafbdbd237ee87fb49b1080821e2597b38ff521c/Formula/qt.rb#L33-L44

I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).

Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.

This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Feb 22, 2018
@matthewbauer matthewbauer changed the base branch from master to staging February 22, 2018 17:27
@grahamc
Copy link
Member

grahamc commented Feb 22, 2018

@GrahamcOfBorg eval

I think I fixed an issue here w.r.t. the darwin tag add / drop.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Feb 22, 2018
@LnL7
Copy link
Member

LnL7 commented Feb 23, 2018

@GrahamcOfBorg build qt510.qtbase

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

cannot build derivation '/nix/store/817m9q8l0nfl0ynvqwxm582xdy3zzdpi-apple-framework-AGL.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/hl0q477drr3zw72vmf0yi9mhxn1m9vqh-apple-framework-AudioUnit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/rz9lycclv9q2pzhc5firmcza44n7lvkh-cairo-1.14.10.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/n33ig653qgc66jp8kx52m1j0x0z0hvca-apple-framework-AudioToolbox.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/7gjmzf1xgnbijyis25qw4ww40w09j7rz-harfbuzz-1.7.1.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/k6hf6xw79hry4rw8br6xxib28ax1rccc-apple-framework-AppKit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/qvmykqg4lg392473hla3vd243q53ngax-harfbuzz-icu-1.7.1.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/zjwr1i6rd900k371bi3q5j1nzychjhg5-apple-framework-Cocoa.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/yhaq6rnbd30y70giwawyz0ys477nhwwv-qtbase-5.10.0.drv': 42 dependencies couldn't be built
error: build of '/nix/store/yhaq6rnbd30y70giwawyz0ys477nhwwv-qtbase-5.10.0.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

cannot build derivation ‘/nix/store/x6s44lqbpmkll7cf07kg98kqbhwcrkq2-gsettings-desktop-schemas-3.24.1.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/r9isd3k1yq8kkrs4097l31g0yyzmdr65-json-glib-1.4.2.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/asmi5kl9n6bqdh39s829qx739kh3pk51-pango-1.40.14.drv’: 3 dependencies couldn't be built
cannot build derivation ‘/nix/store/0zxxzdmvqq6kpdbvibhndd5smvaiwv6j-at-spi2-atk-2.26.1.drv’: 2 dependencies couldn't be built
cannot build derivation ‘/nix/store/56lk0wr6j9xh78h662qyqbdd9ppqz38s-graphviz-2.40.1.drv’: 2 dependencies couldn't be built
cannot build derivation ‘/nix/store/scp38fb7hf0417bswl23mlzipgrqx0zk-gtk+3-3.22.26.drv’: 9 dependencies couldn't be built
cannot build derivation ‘/nix/store/2fgpklamk8yayc8h3ajc0svgyhg856lc-vala-0.38.4.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/c6ksr7b59hcswx4c8ny019qnifj8909d-dconf-0.26.1.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/29g91ixwqm92y8sbrs8vm9ql41adp38b-qtbase-5.10.0.drv’: 4 dependencies couldn't be built
error: build of ‘/nix/store/29g91ixwqm92y8sbrs8vm9ql41adp38b-qtbase-5.10.0.drv’ failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

Removing empty /nix/store/dsz2nkhvj0k1pfkqw93577wb1ifkwza7-qtbase-5.10.0/bin/ and (possibly) its parents
Moving /nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin/uic to /nix/store/vhva9x7j147wypk2kdxvdk7j21kh6i2r-qtbase-5.10.0-dev/bin/uic
rmdir: failed to remove '/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin': Directory not empty
updateToolPath: Updating `/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin/uic' in `/nix/store/vhva9x7j147wypk2kdxvdk7j21kh6i2r-qtbase-5.10.0-dev/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin/moc' in `/nix/store/vhva9x7j147wypk2kdxvdk7j21kh6i2r-qtbase-5.10.0-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin/qmake' in `/nix/store/vhva9x7j147wypk2kdxvdk7j21kh6i2r-qtbase-5.10.0-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin/rcc' in `/nix/store/vhva9x7j147wypk2kdxvdk7j21kh6i2r-qtbase-5.10.0-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
Moving /nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin/bin to /nix/store/vhva9x7j147wypk2kdxvdk7j21kh6i2r-qtbase-5.10.0-dev/bin
rmdir: failed to remove '/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin': Directory not empty
/nix/store/m3ayfkhn83w1dghzacmypm2xx7zp5akz-qtbase-5.10.0-bin

@matthewbauer
Copy link
Member Author

@grahamc Do you know what's going on with @GrahamcOfBorg? It might just be too big for it to build.

LnL7
LnL7 approved these changes Feb 26, 2018
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Build also looks good

@LnL7 LnL7 merged commit b4cf3f7 into NixOS:staging Feb 26, 2018
@matthewbauer
Copy link
Member Author

@LnL7 The pkg-config files are now installed in the installs- which is great. But I now realize that the headers are not being installed correctly in /include. Could you apply this small patch to this PR (alternatively I can open a new PR but hoping this will be easier especially onto staging).

Branch: https://github.com/matthewbauer/nixpkgs/tree/qt5-darwin-pkgconfig-2
Commit: d242196

@LnL7
Copy link
Member

LnL7 commented Feb 28, 2018

Cherry picked in 4e207ba. I couldn't test on staging directly because of pixman, but it everything looked good on master.

vcunat pushed a commit that referenced this pull request Mar 7, 2018
@LnL7 @vcunat
Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig
c6de8f3 
qt5: install pkg_config files on darwin
(cherry picked from commit b4cf3f7)
@matthewbauer matthewbauer deleted the qt5-darwin-pkgconfig branch February 22, 2019 04:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

@LnL7 LnL7 LnL7 approved these changes

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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@matthewbauer @grahamc @LnL7 @GrahamcOfBorg @ttuegel