1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

18141 commits

Author SHA1 Message Date
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
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
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
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 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
Eduard Bachmakov 352ff0be29 protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2
Also split out gmock's source so that it can be copied into protobuf's
source. Hopefull this hack can be removed again once gmock is replaced
by gtest.

This does not include python bindings.
2016-01-18 00:43:21 -05:00
Mateusz Kowalczyk 2be0338ec3 Merge pull request #12329 from luke-clifton/gsasl-krb5
Bring in krb5 for darwin builds seeing as we use
2016-01-17 17:38:50 +00:00
Nikolay Amiantov 8bc95895e1 openmpi: remove enableStatic while it's still hot
Eelco showed alternative way of building static libraries via
stdenv adapter in a conversation several days ago and expressed
concern about adding new enableStatic flags.
2016-01-17 15:07:51 +03:00
Domen Kožar e16ed8c579 Merge pull request #12287 from abbradar/openmpi
openmpi: 1.6.5 -> 1.10.1
2016-01-17 12:59:05 +01:00
Vladimír Čunát 4a097fdc3f ffmpeg-2.2: remove this vulnerable branch
Upstream doesn't maintain it anymore and it's unused in nixpkgs.
/cc #12437.
2016-01-17 11:45:10 +01:00
Vladimír Čunát 85628148de ffmpeg(-2.8): security update to fix #12437
2.8.5 is claimed to fix CVE-2016-{1897,1898}.
2016-01-17 09:56:32 +01:00
Gabriel Ebner c7e48a3eb8 libsoup: 2.50.0 -> 2.52.2 2016-01-16 08:51:38 +01:00
Gabriel Ebner e8980608c6 glib-networking: 2.44.0 -> 2.46.1 2016-01-16 08:40:44 +01:00
Vladimír Čunát 340d3088aa telepathy-qt: finish the of fix parallel build
Recommended by upstream
https://bugs.freedesktop.org/show_bug.cgi?id=93707#c5
2016-01-15 19:55:06 +01:00
Robin Gloster 00b2e1f704 Merge pull request #11809 from mayflower/fix/libvirtd_service
libvirtd service: Move mutable configs to /var
2016-01-15 18:58:40 +01:00
Vladimír Čunát dbfb717f55 telepathy-qt: tiny update 0.9.6 -> 0.9.6.1 2016-01-15 18:06:01 +01:00
Vladimír Čunát cdb0db3f31 telepathy-qt: fix parallel build by upstream patch 2016-01-15 18:06:00 +01:00
Tristan Helmich bce59a1a8b libvirtd service: Move mutable configs to /var
Modifies libvirt package to search for configs in /var/lib and changes
libvirtd service to copy the default configs to the new location.

This enables the user to change e.g. the networking configuration with
virsh or virt-manager and keep those settings.
2016-01-15 14:26:20 +01:00
Vladimír Čunát 6607b72dc0 Revert "eigen: 3.2.5 -> 3.3-alpha1" to fix freecad
This reverts commit c8b9753882.
Fixes #12401. It wasn't intended to have "alpha" version as default.
2016-01-15 13:56:37 +01:00
Vladimír Čunát 2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vincent Laporte 60e1740763 goffice: 0.10.24 -> 0.10.26 2016-01-15 10:04:06 +01:00
Vladimír Čunát e534896c7d telepathy-qt: disable parallel make
http://hydra.nixos.org/build/30377457/nixlog/1/raw
https://bugs.freedesktop.org/show_bug.cgi?id=93707
2016-01-14 11:31:32 +01:00
Nikolay Amiantov ad735e76e7 vc: 1.0.0 -> 1.1.0 2016-01-13 21:21:43 +03:00
Nikolay Amiantov 530ac7b17b cppzmq: 20150926 -> 20151203 2016-01-13 21:21:43 +03:00
Nikolay Amiantov ca4e0a483e libtirpc: 0.3.2 -> 1.0.1 2016-01-13 21:21:43 +03:00
Nikolay Amiantov 0f516115a4 libbluray: 0.9.0 -> 0.9.2 2016-01-13 21:21:43 +03:00
Nikolay Amiantov 1ea34520cd opendkim: adopt, cleanup and fix opendkim-genkey 2016-01-13 13:07:11 +03:00
Slawomir Gonet 0d02182843 utox, libutoxcore and filter_audio version bump 2016-01-12 21:44:38 +01:00
Nikolay Amiantov e9597ff555 Revert "libpcap: support static build"
This reverts commit ee6ca494d2.
2016-01-12 17:15:14 +03:00
Nikolay Amiantov ee6ca494d2 libpcap: support static build 2016-01-12 15:06:15 +03:00
Luke Clifton 8da514d726 Bring in krb5 for darwin builds seeing as we use 2016-01-12 21:00:33 +11:00
Tobias Geerinckx-Rice b021d9aacf metaEnvironment: remove dead packages
Broken since 2013. Upstream is dead.
2016-01-12 03:08:10 +01:00