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.

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

ktouch: init at 18.12.0 #53859

Merged
merged 2 commits into from Jan 13, 2019
Merged

ktouch: init at 18.12.0 #53859

merged 2 commits into from Jan 13, 2019

Conversation

schmittlauch
Copy link
Member

@schmittlauch schmittlauch commented Jan 12, 2019

Motivation for this change

Follow-up to #53256

A small fix for qtdeclarative was necessary to get it built (see respective commit), which causes plenty of rebuilds of dependants.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
@schmittlauch schmittlauch mentioned this pull request Jan 12, 2019
10 tasks
@schmittlauch
Copy link
Member Author

@ttuegel I guess a backport would then have to go to staging-18.09, right?

find_package(Qt5 COMPONENTS Qml Core)

- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen")
+ set(compiler_path "qmlcachegen")
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should also propose upstream this. It would help with cross-compilation.

Copy link
Member Author

Choose a reason for hiding this comment

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

Shall I take care of bringing this upstream?

Copy link
Member Author

Choose a reason for hiding this comment

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

Although I'm afraid this might get rejected: Qt stores a lot of its development tools under /var/lib{,exec} , which in most FHS distros is not in PATH. So our approach of relying the binary to be in our PATH won't work there.

@Mic92
Copy link
Member

Mic92 commented Jan 13, 2019

Maybe the [WIP] label can be removed now i.e. squashing all ktouch commits into one.

packaging the `ktouch` touch typing tutor. Due to Qt impurities, it
needs to be installed in a profile to find it runtime dependencies.
@schmittlauch
Copy link
Member Author

After building all dependencies overnight, I discovered that one run-time dependecy was missing and added it.

@Mic92 squashing is done.

@Mic92 Mic92 merged commit 7b7865a into NixOS:staging Jan 13, 2019
@schmittlauch
Copy link
Member Author

backport: #53887

@vcunat
Copy link
Member

vcunat commented Feb 20, 2019

On Hydra this package never built successfully on master: https://hydra.nixos.org/job/nixpkgs/trunk/ktouch.x86_64-linux/all Now reported as #56097

However, on 18.09 it does build.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants