3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

129 commits

Author SHA1 Message Date
Dan Peebles 2c51846728 qt48: fix on darwin
because it's ancient, it relies on ancient APIs that Apple has deprecated
for literally years. Our new CoreFoundation cleanup means those APIs are no longer here, so let's kill the functionality. Eventually support for it
got removed from upstream too, so it's not as if we're doing anything too
awful here.
2018-09-16 21:06:56 -04:00
Tor Hedin Brønner 34baf00b72 {qt4,qt3}: Fix breakage after eeb9837beb
- qt-4: Pass the correct configureFlags, in particular `mk` should prepend `no-`
  when `cond` is false.

- qt-3: simply revert the changes
2018-08-13 16:25:37 +02:00
John Ericson eeb9837beb qt-{3,4.8}: Clean up generally 2018-08-02 15:17:46 -04:00
John Ericson 6bee6b8f4b qt-4.8: Don't use crossAttrs 2018-07-24 20:01:43 -04:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer 6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer ef82607d90
qt48: fix patch url
See #39927
2018-05-03 17:57:51 -05:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Nikolay Amiantov f362cf23d7 qt4: remove OpenGL absolute path patch
In resulting derivation there's no mention of this path anyway (checked with grep).
2018-03-26 14:01:49 +03:00
Nikolay Amiantov 6bf1421f13 treewide: refactor to use libglvnd
* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
2018-03-26 14:01:49 +03:00
Alexander V. Nikolaev e94cd63bf5 treewide: transition libGL/libGLU for qt
Also rename mesaSupported to libGLSupported
2018-02-24 17:06:49 +02:00
Vladimír Čunát d74d79a712
qt4: fix evaluation on Darwin after parent commit 2018-02-17 10:21:22 +01:00
Vladimír Čunát 44a2012ccc
qt4: disable warnings to fit log on Hydra
Also convert flags to list of nix strings.
2018-02-17 10:16:21 +01:00
Daiderd Jordan 4c07aea8d8
qt48: fix darwin build with clang-5 2018-02-14 00:34:27 +01:00
Will Dietz c48974c952 qt4: Add patch for socklen_t on musl, from alpine 2018-02-13 09:44:54 -06:00
Robin Gloster ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Orivej Desh dd604d575f Merge branch 'master' into staging
* master: (39 commits)
  pythonPackages: rename dns -> dnspython
  awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
  qt4: fix qmake on darwin and delete custom install phase
  python.buildEnv: always include the $out output
  nix-bash-completions: lazy load aware install
  borg: 1.1.1 -> 1.1.3
  nixos/programs/bash: document that /etc/bash_completion.d is obsolete
  ocamlPackages.markup: 0.7.4 -> 0.7.5
  hhvm: 3.21 -> 3.23.2
  ocamlPackages.ulex: 1.1 -> 1.2
  notmuch: 0.25.2 -> 0.25.3
  gmime3: 3.0.1 -> 3.0.5
  qt4: fix darwin install phase
  nixos/programs/bash: Let bash-completion lazy load scripts
  Revert "gmime: 3.0.1 -> 3.0.5"
  rawtherapee: delete unused files
  pythonPackages: rename dns -> dnspython
  nixpkgs: remove sqlite/kyotocabinet deps for leveldb
  tor-browser-bundle-bin: 7.0.10 -> 7.0.11
  networkmanager: remove restart after suspend from resume
  ...
2017-12-10 15:24:30 +00:00
Orivej Desh f601ecfb21 qt4: fix qmake on darwin and delete custom install phase
Since keeping `installPhase = ""` to signify "use the default installPhase" will
be surprising, this deletes the installPhase and rebuilds qt4 on all platforms.

Fixes #30238
2017-12-10 14:22:02 +00:00
Orivej Desh 5b53774f89 qt4: fix darwin install phase
by creating $out before copying lib to $out
2017-12-10 10:22:08 +00:00
Orivej Desh ca4f822fd8 qmake4Hook: enable parallel building with qmake4Hook by default 2017-12-07 08:52:42 +00:00
Orivej Desh 6b4f0b5bf4 qt4: fix parallel building
qmake needs uic to extract dependency information from .ui files.  In -fast mode
qmake generates Makefiles for each subproject after the previous subproject is
built, and by the time it encounters subprojects with .ui files, uic is
available to provide dependency information.  In -no-fast mode qmake builds
subprojects in the same order, but generates all Makefiles beforehand, without
uic, and they miss dependencies.
2017-11-30 09:51:14 +00:00
Orivej Desh c8d822252b qt4: delete parallel-build.patch to replace with a generic fix 2017-11-30 09:51:14 +00:00
Orivej Desh a88146d308 qt4: fix parallel building of moc_qtgradientviewdialog.o
Previously the last of these commands:

```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```

failed with this error:

```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
                 from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
                 from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```

because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
2017-11-29 09:08:44 +00:00
Orivej Desh 8b0ef2a564 qt4: enable parallel building in the configure phase 2017-11-29 09:06:42 +00:00
John Ericson e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Orivej Desh 71a2a5ae40 qt4: enable parallel building
Please let me know if it fails to build in parallel so we could fix it, because
overwise it is a bottleneck of mass rebuilds.
2017-11-21 19:30:18 +00:00
Luke Adams 0aa6d90845 qt4: Override broken installPhase on Darwin 2017-10-10 17:08:34 -05:00
Tuomas Tynkkynen bc850cfed5 qt4: Add aarch64 patch 2017-09-19 10:59:11 +03:00
Thomas Tuegel 9aa4f09008
qt4: unset LD
Commit 093cc00cdd sets the `LD' environment
variable by default, interfering with the Makefile which uses gcc for linking.
2017-07-21 16:49:32 -05:00
John Ericson f16ee76ca8 qt 4.8: Don't use stdenv.cross 2017-06-28 18:31:37 -04:00
John Ericson 594d264205 cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
Nikolay Amiantov b5258982d2 qt4: enable gtk2 by default 2017-04-13 02:13:07 +03:00
Dan Peebles 409fe12f76 qt4: fix to work on clang 4
The new clang is more strict about signed comparisons against pointers,
so this adds a couple of ad-hoc patches to appease it.
2017-03-30 11:03:05 -04:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
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