Nikolay Amiantov
d3877b7cb0
Merge pull request #14611 from abbradar/ogre-no-nvidia
...
ogre: don't build with nvigia-cg and samples by default, add flags
2016-04-20 21:06:56 +04:00
Nikolay Amiantov
039ff272ee
qt55: remove configureScript from qt5Submodule
2016-04-20 19:02:13 +03:00
Nikolay Amiantov
79008f6095
signon: move to qmakeHook
...
This reverts commit 96bed5b7aa
.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
1b032e5221
qwt: move to qmake4Hook
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
d441238b52
qt5.qwt: move to qmakeHook
...
This reverts commit 8779e0f274
.
2016-04-20 18:55:53 +03:00
Nikolay Amiantov
82af8640e3
quazip: move to qmakeHook
...
This reverts commit d663b3df24
.
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
1875538730
qtscriptgenerator: spaces
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
5b17e82559
qt55.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
4a4567b731
qt54.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
b69940ee76
qscintilla: move to qmake4Hook
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
e307c3dac2
qoauth: move to qmake4Hook
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
005dab1a7a
qmltermwidget: move to qmakeHook
...
This reverts commit 2d6ea2cc30
.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
49558b04d2
liqglviewer: move to qmake4Hook
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
9a2bd51a30
libkeyfinder: move to qmakeHook
...
This reverts commit f43d8b2336
.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
ac1a531933
libcommuni: move to qmakeHook
...
This reverts commit ee1af147f3
.
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
4b5bf1916a
herqq: move to qmake4Hook
2016-04-20 18:55:51 +03:00
Nikolay Amiantov
068c7b68a2
accounts-qt: move to qmakeHook
...
This reverts commit 25382a37e3
.
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
31d6dd6be0
CGAL: fix build
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
b857459bdb
qt5.qmakeHook: init, move from qtbase's setup hook
2016-04-20 18:55:37 +03:00
Nikolay Amiantov
065a7515a7
qmake4Hook: init
2016-04-20 18:48:01 +03:00
Thomas Tuegel
3ecbb214b6
phonon: fix evaluation error
2016-04-20 10:15:10 -05:00
Thomas Tuegel
01b171c877
phonon: fix build after cmake setup hook changes
2016-04-20 10:01:06 -05:00
Thomas Tuegel
491f7f017c
cmake: set LIBDIR and INCLUDEDIR for multiple outputs
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d088e0621e
dbus: 1.8.20 -> 1.10.8
2016-04-20 10:01:06 -05:00
Thomas Tuegel
924c0d34e7
qt55.polkit-qt: set CMAKE_INSTALL_INCLUDEDIR
2016-04-20 10:01:06 -05:00
Thomas Tuegel
afef9d4b0a
polkit-qt-1: separate Qt 4 and Qt 5 versions
2016-04-20 10:01:06 -05:00
Thomas Tuegel
40ebe0bad3
qt55.polkit-qt: use multiple outputs
2016-04-20 10:01:06 -05:00
Thomas Tuegel
84a83feb4d
qt55.qtbase: do not link $out/lib into $dev/
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d5c100dc21
makeQtWrapper: defer environment settings to prePhases
2016-04-20 10:01:06 -05:00
Thomas Tuegel
8727485e08
qt55.qtbase: canonicalize paths in addToSearchPathOnce
2016-04-20 10:01:06 -05:00
Thomas Tuegel
51fe07711f
qt55.qtbase: disable plugin path debugging
2016-04-20 10:01:06 -05:00
Thomas Tuegel
35f9c58206
qt55.qtquick1: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e0a87ce931
qt55.qtdeclarative: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e6c91d586c
qt55.qtbase: debug NIX_PROFILES paths
2016-04-20 10:01:06 -05:00
Vladimír Čunát
57474b7d4a
Merge branch 'master' into staging
...
Compare to Hydra nixpkgs job 1260021.
2016-04-20 16:49:52 +02:00
Vladimír Čunát
802f830b2a
gtk3: maintenance update 3.20.0 -> 3.20.3
2016-04-20 16:46:01 +02:00
Damien Cassou
914e193dba
gegl: 0.3.0-20140619 -> 0.3.6
2016-04-20 16:46:00 +02:00
Damien Cassou
d30a9fd186
telepathy-glib: 0.24.0 -> 0.24.1
2016-04-20 16:46:00 +02:00
Damien Cassou
325cfb2192
gtk3: 3.18.5 -> 3.20.0
2016-04-20 16:46:00 +02:00
Damien Cassou
386597c132
gdk-pixbuf: 2.32.3 -> 2.34.0
2016-04-20 16:45:59 +02:00
Damien Cassou
3e3a24e2c6
json-glib: 1.0.2 -> 1.2.0
2016-04-20 16:45:59 +02:00
Damien Cassou
39af1c76e1
gobject-introspection: 1.46.0 -> 1.48.0
2016-04-20 16:45:58 +02:00
Damien Cassou
9c8148dbab
glib: 2.46.1 -> 2.48.0
2016-04-20 16:45:58 +02:00
Damien Cassou
7629cd6b34
libsigcxx: 2.6.2 -> 2.8.0
2016-04-20 16:45:58 +02:00
Vladimír Čunát
c9fe0d779c
libjpeg(-turbo): drop unneeded autoreconf, fix cross
2016-04-20 16:45:58 +02:00
Vladimír Čunát
aa711c58bf
mesa: maintenance update 11.1.2 -> 11.1.3
...
There's also 11.2.1, but I don't have time to test ATM,
and such a change might be risky without any testing.
2016-04-20 16:39:49 +02:00
vbgl
df681cda9a
Merge pull request #14705 from acowley/qt4-darwin
...
qt4.8: darwin compatibility
2016-04-20 11:25:55 +02:00
Cole Mickens
b301b00b89
libinput: v1.2.2 -> v1.2.3
2016-04-19 22:45:20 -07:00
Alexander Ried
e898c4f1d5
libvirt: add comment about updating
2016-04-20 00:03:37 +02:00
Anthony Cowley
eccfe71bae
qt4.8: darwin compatibility
...
Supplies the necessary system frameworks.
2016-04-19 17:09:29 -04:00
Tuomas Tynkkynen
d9d96ff40d
Merge pull request #14825 from knedlsepp/add_nanoflann
...
nanoflann: init at 1.1.9
2016-04-19 22:12:47 +03:00
Josef Kemetmueller
b8525851af
nanoflann: init at 1.1.9
2016-04-19 18:45:46 +02:00
Vincent Laporte
f3536f8ca0
cairo: build cairo-xlib even on Darwin
2016-04-19 18:06:53 +02:00
Alexey Shmalko
0ebe901035
avro-c++: Init at 1.7.5
2016-04-19 16:57:02 +03:00
Eelco Dolstra
b4bf432709
nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs
...
Note: I ignored the C++ libraries, but it appears we're not currently
using them. Once we do, we'll probably want to put them in a separate
output as well (to prevent non-C++ users from depending on Boost).
2016-04-18 21:13:18 +02:00
joachifm
c7f9b6c440
Merge pull request #13968 from bzizou/libibverbs
...
libibverbs: added mlx4 and mthca userspace driver plugins
2016-04-18 15:30:00 +02:00
Lluís Batlle i Rossell
ecedf80a52
Fixing ogre-paged build.
...
I update to a tree maintained by rigsofrods people.
2016-04-18 12:30:48 +02:00
Tuomas Tynkkynen
00f5f08e05
Merge pull request #14780 from womfoo/update-facter
...
Update facter: 3.1.3 -> 3.1.5 and add new library dependency leatherman 0.4.2
2016-04-18 05:42:56 +03:00
Kranium Gikos Mendoza
6d2fb3c730
leatherman: init at 0.4.2
2016-04-18 01:31:41 +08:00
Tobias Geerinckx-Rice
0352d4fb72
libpsl: list 2016-04-05 -> 2016-04-16
2016-04-17 18:48:14 +02:00
Pascal Wittmann
04e3fe2280
swt: repair shared objects and refactor
2016-04-17 16:34:14 +02:00
Nikolay Amiantov
c225bc8576
bullet: 2.80 -> 2.83
2016-04-17 05:24:40 +03:00
Tuomas Tynkkynen
908aac3ca7
Merge remote-tracking branch 'upstream/master' into staging
2016-04-16 21:06:42 +03:00
Domen Kožar
b4d3a7f62b
nghttp2: more stable url (hopefully)
2016-04-16 09:51:58 +01:00
Vladimír Čunát
5ac500ae68
Merge #14754 : libgcrypt: 1.6.5 -> 1.7.0
...
http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00005.html
> This is a new stable version of Libgcrypt with full API
> and ABI compatibiliy to the 1.6 series.
2016-04-16 08:44:37 +02:00
Aneesh Agrawal
f84a2fe412
libgcrypt: 1.6.5 -> 1.7.0
2016-04-15 22:43:04 -04:00
Anthony Cowley
184a3957e6
ffmpeg-full: avfoundation indev support on darwin
...
Adds support for camera input devices on OS X.
This required fixing links in output libraries and executables to pull
in the system's CoreFoundation.framework rather than the open source CF
one.
2016-04-15 18:21:33 -04:00
Franz Pletz
a12be841d6
Merge pull request #14708 from aneeshusa/use-multiple-outputs-for-libressl-2.3
...
libressl: enable multiple outputs
2016-04-15 21:49:12 +02:00
Tuomas Tynkkynen
8a66effde2
Merge remote-tracking branch 'upstream/master' into staging
2016-04-15 22:46:41 +03:00
Tuomas Tynkkynen
b4f97aeae8
uid_wrapper: Remove glibc from build inputs hack
...
Not needed anymore after #14668
2016-04-15 22:45:08 +03:00
Tuomas Tynkkynen
6fac16c6f3
socket_wrapper: Remove glibc from build inputs hack
...
Not needed anymore after #14668
2016-04-15 22:44:22 +03:00
Tuomas Tynkkynen
be02add261
nss_wrapper: Remove glibc from linker flags hack
...
Not needed anymore after #14668
2016-04-15 22:43:14 +03:00
Tuomas Tynkkynen
a01cdca9d1
nss_wrapper: Remove glibc from build inputs hack
...
Not needed anymore after #14668
2016-04-15 22:38:59 +03:00
Aneesh Agrawal
9fb0bf1335
libressl 2.2: enable multiple outputs
2016-04-15 10:43:04 -04:00
joachifm
ff44872c77
Merge pull request #14713 from ericsagnes/fix/libpinyin
...
libpinyin: move to libraries
2016-04-15 05:50:06 +02:00
aszlig
96bed5b7aa
signon: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of signon override
the whole configurePhase, so this hook isn't run at all.
This fixes the build of signon and it now successfully compiles on my
machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
f43d8b2336
libkeyfinder: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of libkeyfinder
override the whole configurePhase, so this hook isn't run at all.
This fixes the build of libkeyfinder and it now successfully compiles on
my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
25382a37e3
accounts-qt: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of accounts-qt
override the whole configurePhase, so this hook isn't run at all.
This fixes the build of accounts-qt and it now successfully compiles on
my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
ee1af147f3
libcommuni: Fix finding qmake
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path.
As the configurePhase is replaced by a qmake path directly from qtbase,
it won't work because the setup-hook from qtbase needs to do some setup
in order for qmake to find its own data files.
So instead of hardcoding that path, we just go for setting the
configureFlags attribute and replacing which with "type -P" so that the
configure script can figure out the right path to qmake on its own.
This fixes the build of libcommuni and it now successfully compiles on
my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
2d6ea2cc30
qmltermwidget: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qmltermwidget
override the whole configurePhase, so this hook isn't run at all.
This fixes the build of qmltermwidget and it now successfully compiles
on my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Eric Sagnes
c6ec758fe3
libpinyin: move to libraries
2016-04-15 10:22:35 +09:00
aszlig
8779e0f274
qt5.qwt: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qwt override
the whole configurePhase, so this hook isn't run at all.
This fixes the build of qwt and it now successfully compiles on my
machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:29:56 +02:00
aszlig
d663b3df24
qt5.quazip: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of quazip override
the whole configurePhase, so this hook isn't run at all.
This fixes the build of quazip and it now successfully compiles on my
machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:27:21 +02:00
Aneesh Agrawal
60f97245a2
libressl 2.3: enable multiple outputs
2016-04-14 17:45:43 -04:00
Tobias Geerinckx-Rice
358900674b
webgitgtk 2.12: fix evaluation
...
Remove reference to unknown maintainer @iyzsong.
2016-04-14 19:57:14 +02:00
Michael Raskin
73fba62fb1
Merge pull request #13545 from bendlas/init-webkitgtk-212
...
webkitgtk: init at 2.12
2016-04-14 16:37:56 +00:00
Nikolay Amiantov
cd4b76c821
protobuf: split to multiple outputs
2016-04-14 17:30:40 +03:00
Tuomas Tynkkynen
66de416b7a
treewide: Mass replace 'hunspell}/bin' to refer to the correct outputs
2016-04-14 08:32:20 +03:00
Tuomas Tynkkynen
f34655e28c
openssl-chacha: Split into multiple outputs
...
Mainly done because of this in all-packages.nix:
````
cipherscan = callPackage ../tools/security/cipherscan {
openssl = if stdenv.system == "x86_64-linux"
then openssl-chacha
else openssl;
};
````
... and inside cipherscan we want to refer to `openssl.bin`
2016-04-14 08:32:20 +03:00
Nikolay Amiantov
92f2c5f71e
Revert "glfw3: apparently fix the build"
...
This reverts commit be90eb047c
.
2016-04-14 01:03:48 +03:00
Herwig Hochleitner
6bb9ca5057
webkitgtk: init at 2.12.0
...
this has the b3 jit activated
2016-04-13 20:44:59 +02:00
Michael Raskin
be90eb047c
glfw3: apparently fix the build
2016-04-13 18:52:37 +02:00
Michael Raskin
a9b9c8c23b
libgphoto2: 2.5.9 -> 2.5.10
2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Tuomas Tynkkynen
9bc67ca5c9
Merge pull request #14620 from nico202/ispike
...
iSpike: init at 2.1
2016-04-13 07:21:16 +03:00
Nikolay Amiantov
53ae67fddd
openscenegraph: add withApps flag
2016-04-13 04:35:33 +03:00
Tuomas Tynkkynen
a9ce4b0884
libdvdcss: Don't build on Darwin
...
http://hydra.nixos.org/build/34377524/nixlog/1/raw
While at it, add a license.
2016-04-13 04:17:34 +03:00
Franz Pletz
9fd4e1e8dd
libuchardet: 0.0.1 -> 0.0.5
2016-04-12 15:51:32 +02:00
Franz Pletz
8b073d96d7
vaapiIntel: 1.6.1 -> 1.6.2
2016-04-12 15:51:32 +02:00
Franz Pletz
365f5942a4
xvidcore: 1.3.3 -> 1.3.4
2016-04-12 15:51:31 +02:00