Commit Graph
22312 Commits
Author SHA1 Message Date
Arseniy Seroka c03b113a63 Merge pull request #12618 from romildo/update-jflex
jflex: 1.4.3 -> 1.6.1
2016-01-26 18:56:37 +03:00
Ollie Charles 981e8d5582 audiofile: Fix build on darwin 2016-01-26 14:43:46 +00:00
Nikolay Amiantov de26cac3cb mesa: 11.0.8 -> 11.1.1 2016-01-26 14:27:49 +03:00
Nikolay Amiantov 2c2497fc2e libva: 1.6.1 -> 1.6.2 2016-01-26 13:42:54 +03:00
Nikolay Amiantov 768f7d19b5 libvdpau: use OpenGL drivers link directory 2016-01-26 13:42:39 +03:00
Nikolay Amiantov 1b95212a69 libva: use OpenGL drivers link directory 2016-01-26 13:42:36 +03:00
José Romildo Malaquias 663cbd16b8 jflex: 1.4.3 -> 1.6.1 2016-01-26 01:19:18 -02:00
Nikolay Amiantov 364f297bb2 mesa: leave vdpau libraries in lib/vdpau 2016-01-26 04:30:26 +03:00
Nikolay Amiantov 77f280cf18 libvdpau-va-gl: init at 0.3.4 2016-01-26 04:30:26 +03:00
Tobias Geerinckx-Rice 0c25292648 vorbis-tools: rename from old-style vorbisTools 2016-01-26 01:35:55 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát 2af19df364 Merge branch 'master' into staging 2016-01-25 10:02:25 +01:00
Tobias Geerinckx-Rice c5bb4f503b libconfuse: init at 2.8 2016-01-25 02:48:27 +01:00
Tobias Geerinckx-Rice 7a853f828d fontconfig-ultimate: 20141123 -> 2015-12-06 2016-01-24 21:14:52 +01:00
Tobias Geerinckx-Rice 3e0e641743 freetype: 2.5.4 -> 2.6.2 2016-01-24 20:39:42 +01:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen 2258aecaa5 treewide: Mass replace 'nss}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 91b40bd9d2 treewide: Mass replace 'libusb}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Tuomas Tynkkynen 51bf60b33e treewide: Mass replace 'bzip2}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Patrick Mahoney 9790094f23 libgdiplus: build on darwin 2016-01-23 21:49:50 -06:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
aszlig 740b30b937 gobject-introspection: Deal with $outputLib
Once #7701 gets merged, we have another environment variable called
$outputLib, which then points to another environment variable which is
the final library output.

This was brought up in discussion with @lethalman and @vcunat in:

https://github.com/NixOS/nixpkgs/pull/12558#discussion_r50599813

The closure-size branch is not yet merged into master, so this is only
a preparation and we're still falling back to $out and $lib whenever
$outputLib isn't available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-23 16:36:14 +01:00
Thomas Tuegel 21bebe1592 qt55.qtbase: fix syntax error 2016-01-23 07:52:29 -06:00
Thomas Tuegel 2b76df28b0 qt54.qtbase: fix evaluation error 2016-01-23 07:03:11 -06:00
aszlig b3b444a79e gobject-introspection: Improve comment in patch
As the comment needed explanation, that it's about temporary build
files, this should do better.

Thanks again to @lethalman for pointing that out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-23 00:14:53 +01:00
aszlig 723f7f8f4f gobject-introspection: Don't hardcode /nix/store
If no config.nix.storeDir has been set, don't fall back to "/nix/store"
but use builtins.storeDir instead so we always should end up with the
correct store path no matter whether config.nix.storeDir has been set.

Thanks to @lethalman for pointing this out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 23:55:31 +01:00
aszlig c83e697aa0 gobject-introspection: Add fallback for libraries
After patching up the shared libraries in c420de6 to use absolute paths,
there are still some libraries left which do not get an absolute paths
assigned.

Those libraries are the ones which have an absolute path outside of the
Nix store, so we assume that they're build products of the current build
and make them absolute by prepending "$out/lib" or "$lib/lib" (depending
on whether it's a multiple output derivation or not) to its basename.

So for my test case, the resulting library paths now look like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /nix/store/...-libblockdev-1.3/lib/libbd_utils.so.0

Which is perfectly fine and everything gets resolved correctly after
importing the library using GI.

However, I didn't test it against other libraries and programs, so this
still needs testing, especially for Darwin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 22:46:14 +01:00
aszlig c420de6b05 gobject-introspection: Fix patching shared objects
The gi-r-scanner is generating a list of shared libraries that are
referenced in the shared-library attribute of the <namespace/> element
of the GIR file. However, this attribute only contains the names of the
libraries and not the full store paths, like for example while preparing
to package libblockdev, the following items were included in the
shared-library attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  libm.so.6
  libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

Unfortunately, loading such a library without setting LD_LIBRARY_PATH is
going to fail finding libm.so.6 and libdmraid.so.1.0.0.rc16.

Now the first attempt at solving this was to put absolute paths of all
the libraries referenced in the shared-library attribute, but this also
led up to including paths of build-time shared objects into that
attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /tmp/nix-build-libblockdev-1.3.drv-0/.../utils/.libs/libbd_utils.so.0

This of course is not what we want, so the final solution is to only
use the absolute path whenever it is a Nix path and leave the library
name as-is if the path doesn't reside within the store, like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

The downside of this approach is that if not even the output path of the
library is in LD_LIBRARY_PATH, even loading of libbd_utils.so.0 could
fail, so we need to patch the loader as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 22:46:02 +01:00
Nikolay Amiantov c3abcd8415 Merge pull request #12368 from abbradar/ghostscript-update
Ghostscript and CUPS updates
2016-01-22 21:46:52 +03:00
Franz Pletz 0d13b93047 Merge pull request #12496 from exi/id3lib-patch
add id3lib easytag patch for proper unicode handling.
2016-01-22 17:34:48 +01:00
Vladimír Čunát 0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
knupfer bf6a8674d4 libbrotli: init at 53d53e8 2016-01-21 22:13:35 +01:00
Tobias Geerinckx-Rice 1bd1aea84e Merge pull request #12113 from bnikolic/wcslib
wcslib: init at 4.25
2016-01-21 15:59:08 +01:00
Vladimír Čunát 3317eef084 Merge #12414: qutebrowser: fix various things 2016-01-21 11:56:50 +01:00
aszlig 39a07cabe8 gpgme: Use fixed path for GnuPG binaries
By default, GPGME tries to search in $PATH for the gpg and gpgconf
binaries. This has the downside, that the library won't work by its own
and needs to have GnuPG in systemPackages or the user environment.

I've stumbled on this while working on one of the dependencies of
nixos-assimilate and nixpart (volume_key), where the testing environment
didn't come with GnuPG in $PATH and thus the tests have failed.

After testing this with a few programs using GPGME, I haven't found any
weird behavior in conjunction with the GnuPG agent.

However one possible implication could be that if the GnuPG used in
$PATH (and the config files in the user's home directory) should be
vastly incompatible, it could lead to failures.

In practice however, the GnuPG1/2 versions pretty much seem to stay
compatible within their major releases so it shouldn't pose a problem.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-21 01:39:18 +01:00
Bojan Nikolic 6271300819 wcslib: init at 5.12 2016-01-20 21:35:58 +00:00
Matthijs Steen 7f58e162bc guake: init at 0.8.3 (close #11027)
There's a catch noted at the top of the expression.
(vcunat moved it there from the commit message)
2016-01-20 19:33:48 +01:00
Reno Reckling b5c2587698 add id3lib easytag patch for proper unicode handling.
This patch is directly taken from easytag. id3lib is not maintained any longer
and the last release is 13 years old.
This patch fixes some unicode issues.
2016-01-20 13:08:28 +01:00
Tobias Geerinckx-Rice 72cd96a0e1 libpsl: list 2016-01-09 -> 2016-01-15 2016-01-20 09:21:44 +01:00
Vladimír Čunát a7ca9c2105 Revert "glib: fix compilation on SmartOS/Illumos (close #12477)"
This reverts commit 3f9ff30f6d.
Let's go without changing hash instead: e67717bc8d
2016-01-19 17:39:35 +01:00
Danny Wilson e67717bc8d glib: fix compilation on SmartOS/Illumos (close #12479)
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
2016-01-19 17:38:44 +01:00
Danny Wilson 3f9ff30f6d glib: fix compilation on SmartOS/Illumos (close #12477)
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
2016-01-19 16:06:49 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát 315745094c Merge #11535: protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2 2016-01-19 08:25:44 +01:00
Vladimír Čunát 37598195e5 protobuf-3.0: enableParallelBuilding = true
Otherwise it takes quite a long time to build.
2016-01-19 08:24:55 +01:00
Vladimír Čunát 4c1e9ffd12 gmock: refactor source 2016-01-18 18:45:03 +01:00
Vladimír Čunát 9fc8766eaf telepathy-qt: fixup build with qt5
I only tested building with qt4, which turned out to be a mistake.
2016-01-18 12:25:27 +01:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00