diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/boost/1.67.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libcommuni/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/librdf/rasqal.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/mdds/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/missing-include.patch | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/missing-includes.patch | 55 | ||||
-rw-r--r-- | pkgs/development/libraries/neon/0.29.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/neon/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/npth/default.nix | 4 |
13 files changed, 103 insertions, 23 deletions
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 8b9e7ccca7f..150272df6ca 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,8 +1,14 @@ -{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args: +{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.67_0"; + patches = [ (fetchpatch { + url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch"; + sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; + stripLen = 1; + })]; + src = fetchurl { url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_66_0.html diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 4c858242bb5..86cbd01a602 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -4,7 +4,7 @@ , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata +, libsecret, libgdata, python3 # Remove when switching back to meson , autoreconfHook, lzma, bzip2 }: @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"; }; + postPatch = '' + patchShebangs test test-driver + ''; + # Uncomment when switching back to meson # postPatch = '' # chmod +x meson_post_install.py # patchShebangs requires executable file @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + checkInputs = [ python3 ]; + doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" + doInstallCheck = doCheck; + preFixup = '' for f in $out/libexec/*; do wrapProgram $f \ diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 956a8667be5..156b4f72749 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { patches = [ ./bootstrap.patch ]; + # fails 1 out of 1 tests with + # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" + # at least on i686. spooky! + doCheck = stdenv.isx86_64; + meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 0788236b601..f247c48821f 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { # The tests fail on darwin because of install_name if they run # before the frameworks are installed. + doCheck = false; doInstallCheck = true; installCheckTarget = "check"; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 1c7c0715e75..6f1aeefa675 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false +{ stdenv, fetchurl, fetchpatch , buildPlatform, hostPlatform, autoreconfHook + +# libffi is used in darwin stdenv +# we cannot run checks within it +, doCheck ? !stdenv.isDarwin, dejagnu }: stdenv.mkDerivation rec { @@ -40,8 +44,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "info" ]; - buildInputs = stdenv.lib.optional doCheck dejagnu; - nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; configureFlags = [ @@ -54,6 +56,8 @@ stdenv.mkDerivation rec { NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} ''; + checkInputs = [ dejagnu ]; + inherit doCheck; dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling. diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 07f560fe272..124fd017818 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: +{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { postInstall = "rm -rvf $out/share/gtk-doc"; + checkInputs = [ perl ]; + doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..." + doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)" + meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = http://librdf.org/rasqal; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 90d86ea9165..43fee9ccead 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, boost }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; + checkInputs = [ boost ]; + meta = { inherit version; homepage = https://gitlab.com/mdds/mdds; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 028930ba066..480afcf607a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -92,7 +92,7 @@ let self = stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl + ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch deleted file mode 100644 index dd3e6bb64af..00000000000 --- a/pkgs/development/libraries/mesa/missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include <sys/stat.h> - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch new file mode 100644 index 00000000000..feb6ffe428c --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -0,0 +1,55 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 ++++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +@@ -24,6 +24,8 @@ + #ifndef _THREADPOOL_H_ + #define _THREADPOOL_H_ + ++#include <pthread.h> ++ + #define MAXTHREADS 1 + + struct threadpool { +--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include <sys/types.h> + #include <sys/file.h> ++#include <sys/stat.h> + #include <unistd.h> + #include <fcntl.h> + #else +--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h ++++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h +@@ -37,6 +37,7 @@ + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> ++#include <time.h> + #include "util/u_atomic.h" + #include "util/list.h" + +--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +@@ -28,6 +28,8 @@ + #ifndef RADV_AMDGPU_WINSYS_H + #define RADV_AMDGPU_WINSYS_H + ++#include <sys/types.h> ++ + #include "radv_radeon_winsys.h" + #include "ac_gpu_info.h" + #include "addrlib/addrinterface.h"<Paste> diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index e393d50bf9d..dbde83c2d94 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig +{ stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; + checkInputs = [ perl ]; + doCheck = false; # fails, needs the net + meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 2351e3b0800..9c2a3265491 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig +{ stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; + checkInputs = [ perl ]; + doCheck = false; # fails, needs the net + meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 203be8b6907..c02998184fc 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.5"; + name = "npth-1.6"; src = fetchurl { url = "mirror://gnupg/npth/${name}.tar.bz2"; - sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9"; + sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk"; }; doCheck = true; |