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

qtkeychain: Fixes Qt4 build. #46085

Merged
merged 1 commit into from Sep 5, 2018
Merged

qtkeychain: Fixes Qt4 build. #46085

merged 1 commit into from Sep 5, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Sep 5, 2018 •
edited

Motivation for this change

Not 100% enthusiastic at "fixing" Qt4 build as this is. Why? Because the only use (AFAICT) of Qt4 qtkeychain was tomahawk, which has been marked broken and is abandoned upstream. Furthermore, tomahawk supposedly can be built using Qt5 instead (according to recent unreleased commits). Thus this is untested. I won't be mad, possibly glad if instead we remove the Qt4 attribute of qtkeychain.

Though, in the vein of ZHF #45960, I have this fixed cooked and ready. (I cooked it before I could realize this wouldn't be tested.)

It'll need to be cherry-picked to 18.09.

Things done
  • ✔️ Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • ✔️ Fits CONTRIBUTING.md.

@GrahamcOfBorg build qtkeychain libsForQt5.qtkeychain

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: qtkeychain

Partial log (click to expand)

-- Installing: /nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1/lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1
shrinking /nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1/lib/libqtkeychain.so.0.9.1
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1/lib
patching script interpreter paths in /nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1
checking for references to /build in /nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1...
/nix/store/81wisy1pxdkhq0xwis96rzvr05wy4yrp-qtkeychain-qt4-0.9.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: qtkeychain

Partial log (click to expand)

-- Installing: /nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1/lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
glibPreFixupPhase
post-installation fixup
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1/lib
patching script interpreter paths in /nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1
/nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1/lib/libqtkeychain.0.9.1.dylib: fixing dylib
/nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1/lib/libqtkeychain.0.9.1.dylib: fixing dylib
/nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1/lib/libqtkeychain.0.9.1.dylib: fixing dylib
/nix/store/bkk9h3fld5pjlk2zd9v1bzsj9j459z8z-qtkeychain-qt4-0.9.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: qtkeychain

Partial log (click to expand)

-- Installing: /nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1/lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1
shrinking /nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1/lib/libqtkeychain.so.0.9.1
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1/lib
patching script interpreter paths in /nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1
checking for references to /build in /nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1...
/nix/store/1g4gskj4i4sk6qcg240ph1g2yf6c0kvw-qtkeychain-qt4-0.9.1

@xeji
Copy link
Contributor

xeji commented Sep 5, 2018

Thanks for spotting and fixing this.

I won't be mad, possibly glad if instead we remove the Qt4 attribute of qtkeychain.

That would require us to adapt the dead and broken tomahawk (waste of time), or drop that as well.
Let's merge this for now and consider dropping both tomahawk and qtkeychain from master in the future.

@xeji xeji merged commit c59d9d3 into NixOS:master Sep 5, 2018
xeji pushed a commit that referenced this pull request Sep 5, 2018
@samueldr @xeji
qtkeychain: Fixes Qt4 build. (#46085)
dea9a04 
(cherry picked from commit c59d9d3)
@xeji
Copy link
Contributor

xeji commented Sep 5, 2018

backport: dea9a04

@samueldr samueldr deleted the zhf/qtkeychain branch September 5, 2018 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@samueldr @GrahamcOfBorg @xeji