3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

69 commits

Author SHA1 Message Date
Vladimír Čunát 50fadc8b18
cups: split the $lib output
This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
2017-03-12 18:36:30 +01:00
Bjørn Forsman 3d104ab2b3 gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Vladimír Čunát 45fcefd4be
qt4: another attempt to fix build on Darwin 2017-02-04 11:28:33 +01:00
Vladimír Čunát 787c1add0b
qt4: fixup missing space between flags on Darwin
Since 9aae2991f2, /cc @globin.
2017-02-02 13:44:41 +01:00
Robin Gloster 9aae2991f2
qt4: add patch to fix build with gcc6, set c++ std 2017-01-25 20:12:36 +01:00
Matthew Bauer 74b206bce2
qt4: build webkit on Darwin
QtWebkit is needed by Anki
2017-01-17 19:49:25 -06:00
Eelco Dolstra a5ee4d2c78 qt-4: Use multiple outputs
This is a pretty modest use of multiple outputs - mainly to eliminate
-dev outputs from Qt's closure.
2016-09-29 13:05:28 +02:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Nikolay Amiantov 065a7515a7 qmake4Hook: init 2016-04-20 18:48:01 +03:00
Anthony Cowley eccfe71bae qt4.8: darwin compatibility
Supplies the necessary system frameworks.
2016-04-19 17:09:29 -04:00
Thomas Tuegel 9e5b2d5e3d qt48: fix evaluation error on Darwin 2016-03-11 09:10:10 -06:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
janus 55aa9163cc FreeBSD: minor fixes, add notes and make stdenv more robust 2016-01-01 17:01:13 +00:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster 4b5cb62488 qt4: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Vladimír Čunát 783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát 2e2d39f31a qt4: fix patching dlopen paths after multiple outputs
Also another leftover fix.
2015-10-13 20:18:58 +02:00
Vladimír Čunát da9115128c qt4: disable parallel building again
There are still occasional problems on Hydra.
2015-06-10 09:16:53 +02:00
Vladimír Čunát 16b40c7b1f qt48: maintenance update, try enableParallelBuilding
I successfully built it with 8 free cores;
hopefully it won't give problems.

/cc maintainers: @lovek323, @phreedom, @sander.

I wonder that the build reports no support for gstreamer and pulseaudio.
I checked it was so before this commit, but it might still be useful
to enable those.

No more 4.8.x releases are planned. End of support is scheduled to Dec'15.
2015-05-26 20:06:53 +02:00
Spencer Whitt 3e2b774384 cimg, qt4, pdf2svg: enable on Darwin 2015-04-19 19:39:35 -04:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát 2e98616e02 qt4: apply a patch from (K)Ubuntu
Suggested by @ruediger on IRC.
2014-11-10 18:22:32 +01:00
Joel Taylor 6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Vladimír Čunát 920a734a15 qt48: bugfix update 4.8.5 -> .6
Some patches dropped, as they seemed included.
2014-04-29 09:29:11 +02:00
aszlig e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
Vladimír Čunát a84d2267d1 qt4: fix CVE-2013-4549.patch 2013-12-23 18:11:15 +01:00
Vladimír Čunát 619a1f5614 changes proposed for 13-10 update
One feature change: polkit update 8d14c7ba
2013-11-09 18:41:42 +01:00
Eelco Dolstra 58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
bbenoist 45851fc39a qtcreator: Make the qt package optional and introduce the QtSDK
To give the ability to use a different Qt version than the default one
(which can build 3 different times Qt Libraries if we mixed the default
one, the qtcreator one and the version including all the examples and the
docs).

Right now a developer can choose to directly install the QtSDK which
includes a "full" (developerBuild + docs + examples) Qt version and uses
it to build QtCreator.

The possibility to only install QtCreator and its previous behavior has
been kept for flexibility purposes (we do not need to force someone on the
SDK approach).
2013-10-21 09:36:45 +02:00
Jason \"Don\" O'Conal 19c72ae32c qt48: fix impurity on darwin.
Close #982.
2013-09-18 06:45:59 +03:00
Vladimír Čunát 76792f5a9d tarball: fix evaluation of qt on freebsd (mesa) 2013-08-23 09:13:51 +02:00
Vladimír Čunát de5b992ecf qt, glew: propagate glu
After removing qt's dependency on the symlinked combination of mesa and glu,
many qt apps were missing it now (since e9f0d10).
I resove this to a compromise.
2013-08-06 10:37:15 +02:00
Vladimír Čunát 625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Jason \"Don\" O'Conal 48a0d477db qt4: fix build on darwin (close #750) 2013-07-28 09:47:05 +02:00
Jason \"Don\" O'Conal 6fc89eead6 qt48: fix build on darwin
* build with clang
2013-07-12 16:26:47 +02:00
Vladimír Čunát e9f0d1013d qt4: maintenance update 4.8.4 -> 4.8.5
Also fixed search path for libGL.
Tested building against master.
2013-07-04 15:29:23 +02:00
Vladimír Čunát 3cba755596 qt48: minimize default dependencies on non-Linux 2013-06-18 22:03:35 +02:00
Vladimír Čunát 92ecf99373 qt48, gstreamer: attempt to fix on non-Linux 2013-06-18 18:34:25 +02:00
Vladimír Čunát a8f153267c qt48: security fix for CVE-2013-0254
Taken from Gentoo.
2013-06-18 13:57:15 +02:00
Vladimír Čunát cba6d9b11a qt48: I give up, switching off parallel building
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
Vladimír Čunát fa6caedfea qt48: hopefully a version that works for all possibilities
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
2013-06-13 19:18:34 +02:00
Vladimír Čunát 34f152e0d3 qt48: hopefully a good fix for parallel builds, finally
It caused rare failures, mainly for Qt for creator build.
2013-06-13 13:02:23 +02:00
Vladimír Čunát f06f6955bd qt4: fix build via adding dependency in generated makefile
Also reorder attributes into the order in which they are run.
2013-06-10 09:35:35 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
bbenoist 0c6e22adba qt: make docs, demos and examples optionnaly available
As the only option before was to don't include them at all.
2013-06-01 12:51:41 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Evgeny Egorochkin 4ad55db0ad Adding myself as a maintainer of Qt and KDE 2013-05-07 09:57:10 +03:00
Evgeny Egorochkin b8eaa5d3eb Qt4.8: upgrade to 4.8.4 2013-04-30 13:02:50 +03:00