Commit Graph

52 Commits

Author SHA1 Message Date
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
Alexander V. Nikolaev
25a78f7234 qt-3: fix build after libGL transition 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Robin Gloster
572b2bda4e treewide: generalise for both mysql & mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster
d75ae56f3f mariadb: replace to connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Kranium Gikos Mendoza
5d8005b1ef qt3: fix build after multiple-outputs change
also updated source tarball path
2016-07-16 23:39:03 +08:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
7c7d9c10ac qt3: turn off format hardening 2016-02-12 15:10:52 +00:00
Vladimír Čunát
31d9263159 some evaluation fixes
Not all multiple-output fixups were properly tested.
2015-10-28 10:15:52 +01:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Vladimír Čunát
4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Vladimír Čunát
9404b2cc12 qt3: fix infinite recursion created by 0b17251c06 2013-06-28 08:33:43 +02:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Lluís Batlle i Rossell
bcbe60782b Trying to make qt3 build, with a patch related to the new gcc 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32604
2012-02-26 21:27:15 +00:00
Yury G. Kudryashov
af58b6ec5f Pass libpng12 to qt3 and kdelibs3
svn path=/nixpkgs/branches/libpng15/; revision=31441
2012-01-08 20:51:49 +00:00
Yury G. Kudryashov
7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Eelco Dolstra
8fd610bff9 * Fixed Qt 3.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
2009-11-03 21:55:53 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
0389ffe877 * Build Qt with GIF, Xcursor, Xshape support.
svn path=/nixpkgs/trunk/; revision=8419
2007-03-26 18:15:32 +00:00
Eelco Dolstra
fd0c8d9fc9 * Latest Qt, kdelibs.
svn path=/nixpkgs/trunk/; revision=8415
2007-03-26 13:39:50 +00:00
Eelco Dolstra
7a79d1ff6a * Remove references to substitute.sh.
svn path=/nixpkgs/trunk/; revision=7499
2006-12-27 18:17:53 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
1014ca2ad5 * stdenv.mkDerivation: add any attributes in the "passthru" attribute
set to the result, but don't use them in the actual derivation (so
  they're not inputs).  Useful to pass through extra attributes that
  are not inputs, but should be made available to Nix expressions
  using the derivation (e.g., in assertions).

svn path=/nixpkgs/trunk/; revision=6521
2006-09-14 13:30:47 +00:00
Eelco Dolstra
8e5b302403 * Qt: enable OpenGL, Xrandr, Xinerama support.
* MythTV: add OpenGL stuff.

svn path=/nixpkgs/trunk/; revision=6520
2006-09-14 13:24:06 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
20426f9825 * Latest QT 3.x.
svn path=/nixpkgs/trunk/; revision=4345
2005-12-06 21:35:07 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Armijn Hemel
dae499bd6d add a patch which removes a dependency on /bin/pwd so it can be built on
NixOS. It also prevents the following warning:

./configure: line 19: /bin/pwd: No such file or directory
./configure: line 21: /bin/pwd: No such file or directory
The LICENSE, LICENSE.QPL, or LICENSE.GPL file shipped with
this software has disappeared.

Sorry, you are not licensed to use this software.
Try re-installing.

:D

svn path=/nixpkgs/trunk/; revision=4272
2005-11-12 19:07:37 +00:00
Eelco Dolstra
f47cef6607 * Only build MySQL if mysqlSupport is enabled. Reported by Armijn.
svn path=/nixpkgs/trunk/; revision=4182
2005-11-01 11:58:06 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
6e0861d8af * Don't strip everything.
svn path=/nixpkgs/trunk/; revision=2322
2005-03-02 11:31:49 +00:00
Eelco Dolstra
1dcbda3398 * Set the QTDIR variable in a Qt setup hook.
svn path=/nixpkgs/trunk/; revision=2240
2005-02-15 17:44:45 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
ba6f269bf5 * Qt: add optional support for MySQL.
* MythTV: the setup program works :-).
* Added XmlTV.  This requires a huge number of Perl modules, so...
* Added a generic builder for Perl modules.  I'm lazy so the modules
  are defined directly in all-packages-generic.nix.  The generic
  builder also patches Perl scripts to include a hard-coded Perl
  module search path (i.e., similar to an RPATH in ELF executables).

svn path=/nixpkgs/trunk/; revision=2083
2005-01-22 00:19:27 +00:00
Eelco Dolstra
6737187428 * Doh!
svn path=/nixpkgs/trunk/; revision=2074
2005-01-20 15:55:05 +00:00
Eelco Dolstra
8882b48fb0 * Optionally enable thread support in Qt (libqt-mt).
svn path=/nixpkgs/trunk/; revision=2072
2005-01-20 14:23:34 +00:00
Eelco Dolstra
043ac4d1b0 * Fix dangling symlink bin/qmake.
svn path=/nixpkgs/trunk/; revision=2070
2005-01-20 11:39:12 +00:00
Eelco Dolstra
cc896336ef * Qt needs `which'. Also fix execute permission for
config.tests/unix.

svn path=/nixpkgs/trunk/; revision=2069
2005-01-20 09:00:08 +00:00