1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 10:56:53 +00:00
Commit graph

18 commits

Author SHA1 Message Date
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Danny Arnold 4acfe25dd5 zeal: 0.3.0 -> 0.3.1 2016-10-20 10:41:04 +02:00
Peter Hoeg 127a04f4ee zeal: 0.2.1 -> 0.3.0
This new version fixes #8008 which despite the issue being closed was
still a problem.

We now compile it with the default qt5 which as of today is 5.6.1
instead of forcing 5.5.
2016-10-06 13:11:26 +08:00
Nikolay Amiantov 6554997eaa zeal: move to qmakeHook
This reverts commit 9cfc8d94bb.
2016-04-20 18:55:50 +03:00
aszlig 9cfc8d94bb
zeal: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of zeal override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of zeal and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Brian McKenna 3b62c8cdc8 zeal: 0.1.1 -> 0.2.1 2016-01-13 15:06:42 +11:00
Thomas Tuegel 700546fd12 zeal: Qt 5 infrastructure update 2015-12-20 07:56:42 -06:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
lethalman 53f5f6906d Merge pull request #8009 from dnhgff/zeal-doc-xlibs
zeal: add xcb-util-keysyms to buildInputs
2015-06-01 16:00:43 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
dnhgff da516bacea zeal: add xcb-util-keysyms to buildInputs 2015-05-26 09:19:30 -07:00
Sven Keidel 22c8244605 zeal: update to 0.1.1 (close #7858) 2015-05-18 13:46:09 +02:00
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Sven Keidel 92d4ec2ce8 zeal: new package 2015-01-28 00:02:50 +01:00