diff options
Diffstat (limited to 'pkgs/development/libraries')
13 files changed, 108 insertions, 17 deletions
diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index 09d07064527..bccba589e03 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "crossguid"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; diff --git a/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch new file mode 100644 index 00000000000..5d41552df37 --- /dev/null +++ b/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch @@ -0,0 +1,26 @@ +From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@nextrem.ch> +Date: Mon, 3 Oct 2022 22:57:34 +0200 +Subject: [PATCH] Use full path in pkgconfig + +Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch> +--- + PkgConfig.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in +index 381e2343..93860ff0 100644 +--- a/PkgConfig.pc.in ++++ b/PkgConfig.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: Eclipse Cyclone DDS library +-- +2.37.3 + diff --git a/pkgs/development/libraries/cyclondds/default.nix b/pkgs/development/libraries/cyclondds/default.nix new file mode 100644 index 00000000000..64944690839 --- /dev/null +++ b/pkgs/development/libraries/cyclondds/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cyclondds"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "eclipse-cyclonedds"; + repo = "cyclonedds"; + rev = version; + sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268="; + }; + + patches = [ + ./0001-Use-full-path-in-pkgconfig.patch + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Eclipse Cyclone DDS project"; + homepage = "https://cyclonedds.io/"; + license = with licenses; [ epl20 ]; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index e4509d058da..5cab69db676 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index b79c83cbf15..617d51d85ed 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }: +{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gl3w"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index f92f20f1ee3..cd0320184b0 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.107.1"; + version = "1.108.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; + hash = "sha256-6nEjSo0EuYJd9/0NyvTzfUON1OMJt5FBLx7Y8sjnb3I="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; + hash = "sha256-/tCEiPvoIPScpKcDmJ0t21AN+bOBH5/XzOBajQg+7ck="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index f32ee433694..b58c25401c9 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -4,6 +4,8 @@ , SDL , glib , pkg-config + # sdl-config is not available when crossing +, withExamples ? stdenv.buildPlatform == stdenv.hostPlatform }: stdenv.mkDerivation rec { @@ -16,12 +18,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL glib ]; + buildInputs = lib.optional withExamples SDL ++ [ glib ]; - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + configureFlags = lib.optional (!withExamples) "--disable-examples"; meta = { description = "An abstraction library for audio visualisations"; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index ecb247de0ba..905d8330fe4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -10,21 +10,35 @@ cyrus_sasl, libbson, snappy, + darwin, }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.1"; + version = "1.23.2"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; + sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf"; }; # https://github.com/NixOS/nixpkgs/issues/25585 preFixup = ''rm -rf "$(pwd)" ''; + # https://github.com/mongodb/mongo-c-driver/pull/1157 + # related: + # https://github.com/NixOS/nixpkgs/issues/144170 + # mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths. + postPatch = '' + substituteInPlace src/libmongoc/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + substituteInPlace src/libbson/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; nativeBuildInputs = [cmake pkg-config perl]; - buildInputs = [openssl zlib cyrus_sasl]; + buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security]; propagatedBuildInputs = [libbson snappy]; # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF @@ -35,6 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix index 10f6abd79ef..7b2901b69b7 100644 --- a/pkgs/development/libraries/openimagedenoise/1_2_x.nix +++ b/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 8d02b976c91..532ee7a0957 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 75ffe5ae06a..efa19a2ce19 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev +, withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic @@ -75,7 +76,8 @@ let buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. - ++ lib.optional withPerl perl; + ++ lib.optional withPerl perl + ++ lib.optional withZlib zlib; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -142,6 +144,7 @@ let # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. ++ lib.optional static "no-ct" + ++ lib.optional withZlib "zlib" ; makeFlags = [ diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 8ed0c7a744b..5479502abb2 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }: stdenv.mkDerivation rec { pname = "platform-folders"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index f50f47413b4..4d0cbafe373 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + sha256 = "5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ |