diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/SDL_gpu/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/discord-rpc/default.nix | 40 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/gcr/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/gstreamer/ges/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtkd/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/libfilezilla/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/liburing/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/movit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mp4v2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/openmpi/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/qtpbfimageplugin/default.nix | 39 | ||||
-rw-r--r-- | pkgs/development/libraries/soundtouch/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/wavpack/default.nix | 40 |
16 files changed, 235 insertions, 38 deletions
diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix new file mode 100644 index 000000000000..dc88b7b12ef3 --- /dev/null +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: + +stdenv.mkDerivation rec { + pname = "SDL_gpu-unstable"; + version = "2019-01-24"; + + src = fetchFromGitHub { + owner = "grimfang4"; + repo = "sdl-gpu"; + rev = "e3d350b325a0e0d0b3007f69ede62313df46c6ef"; + sha256 = "0kibcaim01inb6xxn4mr6affn4hm50vz9kahb5k9iz8dmdsrhxy1"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 libGLU ]; + + cmakeFlags = [ + "-DSDL_gpu_BUILD_DEMOS=OFF" + "-DSDL_gpu_BUILD_TOOLS=OFF" + "-DSDL_gpu_BUILD_VIDEO_TEST=OFF" + "-DSDL_gpu_BUILD_TESTS=OFF" + ]; + + patchPhase = '' + sed -ie '210s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt + sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "A library for high-performance, modern 2D graphics with SDL written in C"; + homepage = "https://github.com/grimfang4/sdl-gpu"; + license = licenses.mit; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix new file mode 100644 index 000000000000..3a8290a6597a --- /dev/null +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +, rapidjson +, AppKit +, buildExamples ? false +}: + +stdenv.mkDerivation rec { + pname = "discord-rpc"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "discordapp"; + repo = pname; + rev = "v${version}"; + sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + rapidjson + ] ++ stdenv.lib.optional stdenv.isDarwin AppKit; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=true" + "-DBUILD_EXAMPLES=${stdenv.lib.boolToString buildExamples}" + ]; + + meta = with stdenv.lib; { + description = "Official library to interface with the Discord client"; + homepage = "https://github.com/discordapp/discord-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index db606cc02d63..e3517a46e44c 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -97,7 +97,7 @@ , libXv ? null # Xlib support , libXext ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? true, nv-codec-headers ? null # NVIDIA NVENC support +, nvenc ? !stdenv.isDarwin, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder @@ -175,7 +175,7 @@ */ let - inherit (stdenv) isCygwin isFreeBSD isLinux; + inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux; inherit (stdenv.lib) optional optionals optionalString enableFeature; in @@ -190,6 +190,10 @@ assert nonfreeLicensing -> gplLicensing && version3Licensing; assert networkBuild -> gnutls != null || opensslExtlib; assert pixelutilsBuild -> avutilLibrary; /* + * Platform dependencies + */ +assert isDarwin -> !nvenc; +/* * Program dependencies */ assert ffmpegProgram -> avcodecLibrary diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 693fda99759c..218a44215c68 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -45,5 +45,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; + description = "GNOME crypto services (daemon and tools)"; + homepage = https://gitlab.gnome.org/GNOME/gcr; + license = licenses.gpl2; + + longDescription = '' + GCR is a library for displaying certificates, and crypto UI, accessing + key stores. It also provides the viewer for crypto files on the GNOME + desktop. + + GCK is a library for accessing PKCS#11 modules like smart cards, in a + (G)object oriented way. + ''; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 61d39bc96369..703fcb58898a 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gst-plugins-base libxml2 ]; + mesonFlags = [ + "-Dgtk_doc=disabled" + ]; + patches = [ ./fix_pkgconfig_includedir.patch ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index b69e99e0fb8a..1c238a8424c0 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, which, vte }: +, glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }: -stdenv.mkDerivation rec { +let + inherit (gst_all_1) gstreamer gst-plugins-base; +in stdenv.mkDerivation rec { name = "gtkd-${version}"; version = "3.8.5"; @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dmd pkgconfig which ]; propagatedBuildInputs = [ - atk cairo gdk_pixbuf glib gstreamer gst_plugins_base gtk3 gtksourceview + atk cairo gdk_pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview libgda libpeas librsvg pango vte ]; @@ -57,8 +59,8 @@ stdenv.mkDerivation rec { --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ - --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \ - --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib + --replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \ + --replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib substituteInPlace generated/sourceview/gsv/c/functions.d \ --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib @@ -84,11 +86,6 @@ stdenv.mkDerivation rec { installFlags = "prefix=$(out)"; - inherit atk cairo gdk_pixbuf librsvg pango; - inherit (gnome3) glib gtk3 gtksourceview libgda libpeas; - inherit (gst_all_1) gstreamer; - gst_plugins_base = gst_all_1.gst-plugins-base; - meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK+"; homepage = https://gtkd.org; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4a051f34b0ba..2a87994db5ef 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, nettle }: +{ stdenv +, fetchurl + +, gettext +, gnutls +, nettle +, pkgconfig +}: stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v"; + sha256 = "1cnkcl9vif5lz1yx813qrphlpc6gvmzxdmkbd17kh5jqiqdi9vyk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ nettle ]; + buildInputs = [ gettext gnutls nettle ]; meta = with stdenv.lib; { - homepage = https://lib.filezilla-project.org/; + homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index cce10a761d3f..95644e2682ed 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre137_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre150_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "91dde5c956b1af491bc6c16ee230daa4b4b66706"; - sha256 = "0rk1ikrn3s6sp3gx7kc4y6msx7yncr3845m67vhk8lxvhd90sgza"; + rev = "93f3e8d511e53133a4367afe04b5f256073082a0"; + sha256 = "14ndx3z0q6gynkmlwiah6775ss0p1xmjgn428gqgbsganiyhkwgp"; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 849da2e6cad5..96444ea4a23c 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://movit.sesse.net/${name}.tar.gz"; - sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l"; + sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 51081f25bf2d..f920f637960f 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + buildFlags = [ "CXXFLAGS=-std=c++03" ]; + # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 17ad9e53005b..760fc3e32329 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl libevent hwloc ] + ++ lib.optionals isLinux [ libnl numactl ] + ++ [ libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch index 364330169bf1..546e753144d0 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -19,3 +19,15 @@ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf } } else { skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix new file mode 100644 index 000000000000..8ad908013bdc --- /dev/null +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: + +stdenv.mkDerivation rec { + pname = "qtpbfimageplugin"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "tumic0"; + repo = "QtPBFImagePlugin"; + rev = version; + sha256 = "0d39i7rmhrmm2df49gd47zm37gnz3fmyr6hfc6hhzvk08jb6956r"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase protobuf ]; + + postPatch = '' + # Fix plugin dir + substituteInPlace pbfplugin.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + + # Fix darwin build + substituteInPlace pbfplugin.pro \ + --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' + ''; + + meta = with stdenv.lib; { + description = "Qt image plugin for displaying Mapbox vector tiles"; + longDescription = '' + QtPBFImagePlugin is a Qt image plugin that enables applications capable of + displaying raster MBTiles maps or raster XYZ online maps to also display PBF + vector tiles without (almost) any application modifications. + ''; + homepage = https://github.com/tumic0/QtPBFImagePlugin; + license = licenses.lgpl3; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 95a97f30b6e6..71c7915c2ede 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -1,22 +1,24 @@ -{stdenv, fetchurl, autoconf, automake, libtool}: +{stdenv, lib, fetchFromGitLab, autoconf, automake, libtool}: stdenv.mkDerivation rec { - pName = "soundtouch"; - name = "${pName}-2.0.0"; - src = fetchurl { - url = "https://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; + pname = "soundtouch"; + version = "2.1.2"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = version; + sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz"; }; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool ]; preConfigure = "./bootstrap"; - meta = { - description = "A program and library for changing the tempo, pitch and playback rate of audio"; - homepage = http://www.surina.net/soundtouch/; - downloadPage = http://www.surina.net/soundtouch/sourcecode.html; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.all; + meta = with lib; { + description = "A program and library for changing the tempo, pitch and playback rate of audio"; + homepage = "http://www.surina.net/soundtouch/"; + license = licenses.lgpl21; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 079d61ca3d58..8f92e0b64f6a 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -87,10 +87,13 @@ stdenv.mkDerivation rec { vala ]; + propagatedBuildInputs = [ + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + buildInputs = [ cyrus_sasl epoxy - gst_all_1.gst-plugins-base gtk3 json-glib libcacard diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 9eb3254001d5..7163e2a87d7d 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconv, fetchpatch }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -13,6 +13,44 @@ stdenv.mkDerivation rec { sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; + patches = [ + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/26cb47f99d481ad9b93eeff80d26e6b63bbd7e15.patch"; + name = "CVE-2018-10536-CVE-2018-10537.patch"; + sha256 = "0s0fyycd4x7pw4vl1yp2vp4zrlk04j85idvnxz5h96fj6196anw6"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d.patch"; + name = "CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch"; + sha256 = "03qzmaq9mwiqbzrx1lvkgkhz3cjv7dky1b4lka3d5q2rwdlyw5qk"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/d5bf76b5a88d044a1be1d5656698e3ba737167e5.patch"; + name = "CVE-2018-6767.patch"; + sha256 = "158c60i188kbxl0hzb7g74g21pknz7fk429vnbbx9zk1mlyyyl5b"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bf408e95f43fafdcef42c3f5f9c9d0e6ab0331b9.patch"; + name = "CVE-2019-11498-1.patch"; + sha256 = "161dw759v1lzbhj7daw2gbmcji8s0njpa65xmqhqw73bwpzb3xkd"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/cd353bccafb1274a525c3536aaff8c48c3a33aa0.patch"; + name = "CVE-2019-11498-2.patch"; + sha256 = "120sb1iqkq2gadh0qydqvca4vwx31zb7gk1d0nm0y5agav2ai0dk"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/4c0faba32fddbd0745cbfaf1e1aeb3da5d35b9fc.patch"; + name = "CVE-2019-11498-3.patch"; + sha256 = "12744yn1035mf7wzgqrkyadw5mwqf9v34ckj2m5sirk97k47k0wa"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bc6cba3f552c44565f7f1e66dc1580189addb2b4.patch"; + name = "CVE-2019-11498-4.patch"; + sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7"; + }) + ]; + meta = with stdenv.lib; { description = "Hybrid audio compression format"; homepage = http://www.wavpack.com/; |