diff options
Diffstat (limited to 'pkgs/development/libraries')
35 files changed, 100 insertions, 77 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 1ab0718e7960..c79b874ecb69 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -101,21 +101,17 @@ stdenv.mkDerivation { inherit src; - patchFlags = optionalString (stdenv.hostPlatform.libc == "msvcrt") "-p0"; + patchFlags = ""; + patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch - ++ optional (stdenv.hostPlatform.libc == "msvcrt") (fetchurl { - url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" - + "boost-mingw.patch"; - sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; - }); + ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; meta = { homepage = http://boost.org/; description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; - platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.unix; + platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows); maintainers = with maintainers; [ peti wkennington ]; }; @@ -139,7 +135,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which buildPackages.stdenv.cc ]; + nativeBuildInputs = [ which ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 1835356e627d..099d02c82639 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; + configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null; + # ares_android.h header is missing # see issue https://github.com/c-ares/c-ares/issues/216 postPatch = if stdenv.hostPlatform.isAndroid then '' diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8e7d10782157..44086538cd04 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, file, which +, file, which, ncurses , autoreconfHook , git , texinfo , qtbase ? null -, withPython ? false, swig2 ? null, python ? null +, pythonSupport ? false, swig2 ? null, python ? null }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ++ lib.optional (qtbase != null) qtbase; nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] - ++ lib.optionals withPython [ python swig2 which ]; + ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" - ] ++ lib.optional withPython "--enable-languages=python"; + ] ++ lib.optional pythonSupport "--enable-languages=python"; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 501341d202ba..72c3ca0e2b05 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; inherit (qt4.meta) platforms; - license = licenses.gpl2; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index e8651de2b346..32b0c9758f73 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchbzr, cmake, qtbase }: +{ stdenv, fetchgit, cmake, qtbase }: -stdenv.mkDerivation { - name = "libdbusmenu-qt-0.9.3+14"; +stdenv.mkDerivation rec { + name = "libdbusmenu-qt-${version}"; + version = "0.9.3+16"; - src = fetchbzr { - url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; - rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; - sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; + src = fetchgit { + url = https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt; + rev = "import/${version}.04.20160218-1"; + sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx"; }; buildInputs = [ qtbase ]; @@ -19,6 +20,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; - license = licenses.gpl2; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 0b496ff593b3..8dcbab95e976 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { inherit (glib.meta) platforms maintainers; - license = stdenv.lib.licenses.gpl2; + license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 1616aa1e0cc1..0b00cf90ba00 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; - license = with licenses; [ mit isc ]; + license = with licenses; [ mit isc bsd2 bsd3 ]; }; } diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index a53918fd5f77..c83143dd6b13 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -11,10 +11,17 @@ in stdenv.mkDerivation rec { buildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; - meta = { + + meta = with stdenv.lib; { homepage = http://libjson.sourceforge.net/; description = "A JSON reader and writer"; - longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; - platforms = stdenv.lib.platforms.unix; + longDescription = '' + A JSON reader and writer which is super-efficient and + usually runs circles around other JSON libraries. + It's highly customizable to optimize for your particular project, and + very lightweight. For Windows, OSX, or Linux. Works in any language. + ''; + platforms = platforms.unix; + license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 6c7e5881a784..7eff302397aa 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; - meta = { + meta = with stdenv.lib; { description = "A library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { in an Ogg container. It can carry Unicode text, images, and animate them.''; homepage = https://code.google.com/archive/p/libkate/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 331422dd8929..b7d90100837c 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; + maintainers = [ maintainers.phreedom ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 73d996c5ec86..d9f460d44e8c 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://liblastfm.sourceforge.net; description = "Unofficial C lastfm library"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 4b445c93175f..aa6922ea3421 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://liblqr.wikidot.com; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; - maintainers = [ ]; + license = with licenses; [ gpl3 lgpl3 ]; }; } diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index bd0cd9fe9041..7e3c45634d9e 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { description = "Sendmail Milter mail filtering API library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.sendmail; }; } diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index d1dd7860de4e..7f73fb09cd16 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { + description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; homepage = http://libmms.sourceforge.net; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index af8297e98549..52072000115c 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index c3061626a6ae..1d8dd7e20f14 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; - meta = { + meta = with stdenv.lib; { homepage = http://libmtp.sourceforge.net; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in the form of a library suitable primarily for POSIX compliant operating systems. We implement MTP Basic, the stuff proposed for standardization. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index f197d5bcef98..2b59adf8f922 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; - meta = { + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/libmusicbrainz; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 596399c4fa8f..5335b6577f0a 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; - meta = { + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/libmusicbrainz; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 9b692e9e3b2e..db4f6f5d4688 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; - meta = { + meta = with stdenv.lib; { homepage = http://natspec.sourceforge.net/ ; description = "A library intended to smooth national specificities in using of programs"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { propagatedBuildInputs = [ libiconv ]; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 12a45d088ef6..94b3dc90a0b6 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmnl libnfnetlink ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.netfilter.org/projects/libnetfilter_queue/; description = "Userspace API to packets queued by the kernel packet filter"; - - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 1f58545574cd..8582dc4e1d90 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory" - meta = { + meta = with stdenv.lib; { homepage = https://nice.freedesktop.org/wiki/; description = "The GLib ICE implementation"; longDescription = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ lgpl21 mpl11 ]; }; } diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index fbde49a54d08..11f2731eb725 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ]; buildInputs = [ glib gdk_pixbuf ]; - meta = { + meta = with stdenv.lib; { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index a66a1a88c743..cb70d803ac0c 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "libnova-0.12.3"; - + src = fetchurl { url = "mirror://sourceforge/libnova/${name}.tar.gz"; sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; }; - - meta = { + + meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = http://libnova.sf.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 855d921206e9..ea792b007bae 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "C library implementing the OAuth secure authentication protocol"; homepage = http://liboauth.sourceforge.net/; repositories.git = https://github.com/x42/liboauth.git; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 531e30ba7552..8131420cfd65 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -27,12 +27,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - meta = { + meta = with stdenv.lib; { homepage = https://code.google.com/archive/p/musicip-libofa/; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index f6fe9ecd03a0..d7c3b747924a 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = https://xiph.org/oggz/; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f94f327ea02e..267859cb217c 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { description = "Packet Capture Library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 422ace462a94..30d8d8a94e9d 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -38,8 +38,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 17 tests with a segmentation fault - meta = { + meta = with stdenv.lib; { + description = "C libraries that provide support for the Resource Description Framework (RDF)"; homepage = http://librdf.org/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 306becf0c180..de277329961b 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF" - ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "msvcrt") - "-DCMAKE_SYSTEM_NAME=Windows" ; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 68bffd4032d2..471684ea7ddc 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -6,6 +6,7 @@ , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null +, enableApp ? !stdenv.hostPlatform.isWindows }: assert enableHpack -> jansson != null; @@ -35,8 +36,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ] - ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + configureFlags = [ + "--with-spdylay=no" + "--disable-examples" + "--disable-python-bindings" + (stdenv.lib.enableFeature enableApp "app") + ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index ffb735e725ae..25d4386cec2c 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBuildTests=${if doCheck then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ - "-DCMAKE_SYSTEM_NAME=Windows" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index cdb5297a6d87..7fe4b504a992 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "1zhsz1i4jy97idydg7ay3wazp7v2353vckkli5w9g51jka43h5x2"; + sha256 = "1s5gj799aa94nfg3r24whq7ck69g0zypf70w14wx64pgwg0424vf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 166ea39493bf..92574091558a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { homepage = http://www.sqlite.org/; license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 7c4d275e05fe..636021f1368e 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "5.19.1"; + version = "5.20"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="160gvz9xk4hvliwb75ry770qdf899kc89ij6r0y7fh60lbjz1far"; + sha256 ="1c8g9kv4dxrnawnqi4spi2p10s2xs7x75pdfxhbqxgcc97dkgh0b"; }; prePatch = '' diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index d348f877f722..fe1c275aeda5 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -82,4 +82,6 @@ stdenv.mkDerivation (rec { preConfigure = '' export CHOST=${stdenv.hostPlatform.config} ''; +} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { + configurePhase = ":"; }) |