diff options
Diffstat (limited to 'pkgs/development/libraries')
67 files changed, 381 insertions, 258 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index fd3c6b471453..a8d5d608f895 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -6,7 +6,6 @@ , libXext, libICE, libXrandr , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa -, cf-private }: # NOTE: When editing this expression see if the same change applies to @@ -41,11 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile - ++ optionals stdenv.isDarwin [ - AudioUnit CoreAudio CoreServices Kernel OpenGL - # Needed for NSDefaultRunLoopMode symbols. - cf-private - ]; + ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; configureFlags = [ "--disable-oss" diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index a2db9c2349d1..94aca192852d 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -14,7 +14,7 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL -, audiofile, cf-private, libiconv +, audiofile, libiconv }: # NOTE: When editing this expression see if the same change applies to @@ -58,11 +58,7 @@ stdenv.mkDerivation rec { ++ dlopenBuildInputs ++ optional ibusSupport ibus ++ optional fcitxSupport fcitx - ++ optionals stdenv.isDarwin [ - AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL - # Needed for NSDefaultRunLoopMode symbols. - cf-private - ]; + ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7f7ef3336a4c..c4cbd970d411 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }: +{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { ./darwin.patch ]; - nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index bffbf4011deb..89dd2b443384 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1q409xrri67vqhda6f6jfqnvzj1b3b9xlpi27vm9vl10k2lv4m3a"; + sha256 = "06a6qgs7q79asfbfp615h5iin23y7g8y1achnmsp3rpkikssskzv"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index 47b39eeb7e97..c1764e83c303 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { src = null; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index d3095099d3c1..9b05165e1b2b 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,28 +1,94 @@ -{ stdenv, fetchFromGitHub, zlib, expat, gettext -, autoconf }: +{ stdenv +, fetchFromGitHub +, zlib +, expat +, cmake +, which +, libxml2 +, python3 +, gettext +, doxygen +, graphviz +, libxslt +}: stdenv.mkDerivation rec { - name = "exiv2-0.26.2018.12.30"; + pname = "exiv2"; + version = "0.27.1"; - #url = "https://www.exiv2.org/builds/${name}-trunk.tar.gz"; src = fetchFromGitHub rec { owner = "exiv2"; repo = "exiv2"; - rev = "f5d0b25"; # https://github.com/Exiv2/exiv2/commits/0.26 - sha256 = "1blaz3g8dlij881g14nv2nsgr984wy6ypbwgi2pixk978p0gm70i"; + rev = version; + sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c"; }; - postPatch = "patchShebangs ./src/svn_version.sh"; + patches = [ + # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments + ./fix-cmake.patch + ]; - preConfigure = "make config"; # needed because not using tarball + cmakeFlags = [ + "-DEXIV2_BUILD_PO=ON" + "-DEXIV2_BUILD_DOC=ON" + ]; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "doc" "man" ]; nativeBuildInputs = [ + cmake + doxygen gettext - autoconf # needed because not using tarball + graphviz + libxslt + ]; + + propagatedBuildInputs = [ + expat + zlib + ]; + + checkInputs = [ + libxml2.bin + python3 + which + ]; + + buildFlags = [ + "doc" ]; - propagatedBuildInputs = [ zlib expat ]; + + doCheck = stdenv.isLinux; + + # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. + checkTarget = "tests"; + + preCheck = '' + patchShebangs ../test/ + mkdir ../test/tmp + export LD_LIBRARY_PATH="$(realpath ../build/lib)" + + # Fix tests on Aarch64 + ${stdenv.lib.optionalString stdenv.isAarch64 '' + rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py + ''} + ''; + + postCheck = '' + (cd ../tests/ && python3 runner.py) + ''; + + # With cmake we have to enable samples or there won't be + # a tests target. This removes them. + postInstall = '' + ( cd "$out/bin" + mv exiv2 .exiv2 + rm * + mv .exiv2 exiv2 + ) + ''; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://www.exiv2.org/; diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch new file mode 100644 index 000000000000..1e19aed8b904 --- /dev/null +++ b/pkgs/development/libraries/exiv2/fix-cmake.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 34087004..41b3a068 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -239,9 +239,9 @@ install(FILES + ${CMAKE_BINARY_DIR}/exiv2lib_export.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) + +-install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") ++install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") + + # ****************************************************************************** + # exiv2 application diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 7e4d46c012dd..ef2574019459 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.6"; + name = "expat-2.2.7"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p"; + sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index db606cc02d63..e16aee9f5ca0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -139,7 +139,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, cf-private +, VideoDecodeAcceleration }: /* Maintainer notes: @@ -419,7 +419,7 @@ stdenv.mkDerivation rec { ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration - libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; + libiconv ]; buildFlags = [ "all" ] ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable @@ -427,14 +427,6 @@ stdenv.mkDerivation rec { # Hacky framework patching technique borrowed from the phantomjs2 package postInstall = optionalString qtFaststartProgram '' cp -a tools/qt-faststart $out/bin/ - '' + optionalString stdenv.isDarwin '' - FILES=($(ls $out/bin/*)) - FILES+=($(ls $out/lib/*.dylib)) - for f in ''${FILES[@]}; do - if [ ! -h "$f" ]; then - install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" - fi - done ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 3cdebe184d7e..cad4419a26cc 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng -, libtiff, freetype, cf-private, Cocoa, AGL, GLUT +, libtiff, freetype, Cocoa, AGL, GLUT }: let version = "1.4.x-r13121"; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { @@ -13,19 +15,16 @@ in stdenv.mkDerivation { sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; }; - preConfigure = "make clean"; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ] + ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; - buildInputs = [ - libGLU_combined - libjpeg - zlib - libpng - libXft - ]; + propagatedBuildInputs = [ xorgproto ] + ++ (if stdenv.isDarwin + then [ freetype libtiff ] + else [ xlibsWrapper libXi freeglut ]); configureFlags = [ "--enable-gl" @@ -35,18 +34,15 @@ in stdenv.mkDerivation { "--enable-xft" ]; - propagatedBuildInputs = [ xorgproto ] - ++ (if stdenv.isDarwin - then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] - else [ xlibsWrapper libXi freeglut ]); + preConfigure = "make clean"; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 60773d29d3d6..bb9f8fe76c9d 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng -, libtiff, freetype, cf-private, Cocoa, AGL, GLUT +, libtiff, freetype, Cocoa, AGL, GLUT }: let version = "1.3.5"; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { @@ -16,14 +18,13 @@ in stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ] + ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; - buildInputs = [ - libGLU_combined - libjpeg - zlib - libpng - libXft - ]; + propagatedBuildInputs = [ xorgproto ] + ++ (if stdenv.isDarwin + then [ freetype libtiff ] + else [ xlibsWrapper libXi freeglut ]); configureFlags = [ "--enable-gl" @@ -33,18 +34,12 @@ in stdenv.mkDerivation { "--enable-xft" ]; - propagatedBuildInputs = [ xorgproto ] - ++ (if stdenv.isDarwin - then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] - else [ xlibsWrapper libXi freeglut ]); - enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2; }; - } diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 668fe436e915..339ce1e5b129 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 -, cf-private, Cocoa, Kernel, fixDarwinDylibNames +, Cocoa, Kernel, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -19,13 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ - libX11 libXrandr libXinerama libXcursor - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa Kernel fixDarwinDylibNames - # Needed for NSDefaultRunLoopMode symbols. - cf-private - ]; + buildInputs = [ libX11 libXrandr libXinerama libXcursor ] + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4b577d36857a..1de54becb5bd 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -81,9 +81,6 @@ stdenv.mkDerivation rec { utillinuxMinimal # for libmount ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation - # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated - # since 10.9 and are not part of swift-corelibs CoreFoundation. - darwin.cf-private ]); nativeBuildInputs = [ diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index a362b1ac6343..0ee66c9050cb 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_DRIVER_SYSCONF=OFF" "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" + # Works only on hosts with suitable CPUs. + "-DMEDIA_RUN_TEST_SUITE=OFF" ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 197911be0d41..d2283f5c1d57 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "heimdal-${version}"; - version = "7.6.0"; + version = "7.7.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; rev = "heimdal-${version}"; - sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp"; + sha256 = "099qn9b8q20invvi5r8d8q9rnwpcm3nr89hx5rj7gj2ah2x5vgxs"; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 77f495e32b84..894faf0b9102 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4"; + sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index bc371423e439..43e6abe1a39f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkgconfig +, exiv2, libgsf, rpm, pkgconfig, fetchpatch , gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; }; + patches = [ + # Fixes build with exiv2 0.27 + (fetchpatch { + name = "libextractor-exiv2-0.27.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53"; + sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6"; + }) + ]; + preConfigure = '' echo "patching installation directory in \`extractor.c'..." sed -i "src/main/extractor.c" \ diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index d32bb82abcb9..9c3d9faf1f4f 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.9"; + version = "0.0.10"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0smfnvfba6cnxbrcm1vh3zbr1hww43qcxhawka3hzn2hjr06rfzn"; + sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 651c43297082..0c759835183b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.13.2"; + version = "1.13.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx"; + sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 737c0dc4a0ab..f6f2412c818a 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.4"; + version = "6.4.5"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "0l62qlln5q1qhapbnm8n1k0hbzf3287gld1jpcbwr0yj79l9j579"; + sha256 = "0djmjr2b5x5nd2a4idv5j8s6w0kdmvil910iv1kyc7x94dirbrni"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index fb4b1ac54a9f..d710c41a97c1 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -39,7 +39,7 @@ let meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://www.libressl.org"; - license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ]; + license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ]; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz globin ]; }; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 71362fd7ef7b..e1d0a51a6685 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "librime"; - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = "${version}"; - sha256 = "10wvh1l4317yzcys4rzlkw42i6cj5p8g62r1xzyjw32ky2d0ndxl"; + sha256 = "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv"; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://rime.im/; + homepage = "https://rime.im/"; description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 957201b83abc..2092d72c9f8d 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a"; + sha256 = "1599j2lbsygy3883x9si7rbad1pkjhl6y72aimaapcv90ga5kxkm"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 483a56dcdce6..d4205981499c 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh2"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "0rqd37pc80nm2pz4sa2m9pfc48axys7jwq1l7z0vii5nyvchg0q8"; + sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 1605abf6efa1..50fdbf2a81f7 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -48,7 +48,7 @@ in rec { }; libtoxcore_0_2 = generic { - version = "0.2.9"; - sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j"; + version = "0.2.10"; + sha256 = "0r5j2s5n8ikayvr1zylvv3ai3smbhm2m0yhpa9lfcsxhvyn9phcn"; }; } diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index dcc406accbd7..446d30c609ee 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, gtk3, cf-private, Cocoa }: +{ stdenv, fetchgit, cmake, pkgconfig, gtk3, Cocoa }: let shortName = "libui"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = stdenv.lib.optional stdenv.isLinux gtk3 - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For NSDefaultRunLoopMode */ ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 0cc1b0d08f9d..90be77401141 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.11.0"; + version = "0.11.1"; name = "liburcu-${version}"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s"; + sha256 = "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj"; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index f5026da4c3b9..ade3f5796d51 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.29.1"; + version = "1.30.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8"; + sha256 = "0j26nh799962l1gn3v3sw1x6fnia2dx5irhl33nc77gy2gzayv07"; }; postPatch = let diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 85b8b128d208..c559d3f84071 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake +, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor @@ -17,22 +17,46 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.10.0"; + version = "5.4.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz"; + sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9"; + sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc"; fetchSubmodules = true; }; + patches = optionals (!stdenv.isDarwin) [ + (fetchpatch { + name = "5.4.0-CVE-2019-10161.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580"; + sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs"; + }) + ] ++ [ + (fetchpatch { + name = "5.4.0-CVE-2019-10166.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a"; + sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml"; + }) + (fetchpatch { + name = "5.4.0-CVE-2019-10167.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26"; + sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml"; + }) + (fetchpatch { + name = "5.4.0-CVE-2019-10168.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291"; + sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g"; + }) + ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl @@ -76,13 +100,14 @@ in stdenv.mkDerivation rec { "--with-esx" "--with-remote" ] ++ optionals stdenv.isLinux [ + "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" + "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" "--with-attr" "--with-apparmor" "--with-secdriver-apparmor" "--with-numad" "--with-macvtap" "--with-virtualport" - "--with-init-script=systemd+redhat" "--with-storage-disk" ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 3e0a2872c005..074de9b061b8 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.8.0"; + pname = "libxkbcommon"; + version = "0.8.4"; src = fetchurl { - url = "https://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8"; + url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; + sha256 = "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0"; }; outputs = [ "out" "dev" "doc" ]; @@ -13,14 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ]; buildInputs = [ xkeyboard_config libxcb ]; - patches = [ - # darwin compatibility - (fetchpatch { - url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch; - sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5"; - }) - ]; - mesonFlags = [ "-Denable-wayland=false" "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index c1f34bd33980..7529d69dddee 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,31 +1,14 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: -let - - version = "0.2.1"; - - # https://github.com/yaml/pyyaml/issues/214 - p1 = fetchpatch { - url = https://github.com/yaml/libyaml/commit/8ee83c0da22fe9aa7dea667be8f899a7e32ffb83.patch; - sha256 = "00jh39zww6s4gyhxfmlxwb6lz90nl3p51k5h1qm6z3ymik5vljmz"; - }; - p2 = fetchpatch { - url = https://github.com/yaml/libyaml/commit/56f4b17221868593d6903ee58d6d679b690cf4df.patch; - sha256 = "0najcay1y4kgfpsidj7dnyafnwjbav5jyawhyv215zl9gg3386n0"; - }; - -in - -stdenv.mkDerivation { - name = "libyaml-${version}"; +stdenv.mkDerivation rec { + pname = "libyaml"; + version = "0.2.2"; src = fetchurl { url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; sha256 = "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q"; }; - patches = [ p1 p2 ]; # remove when the next release comes out - meta = with stdenv.lib; { homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 9abdf4bbd854..836730228353 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.15"; + name = "matio-1.5.16"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "1kxi15ph68nnbi0s1m8icb0685wg8ql8gj7wnkdk20kzpf3lbgr1"; + sha256 = "0i2g7jqbb4j8xlf1ly7gfpw5zyxmr245qf57v6w0jmwx4rfkvfj7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index ee8c8f101a24..ef8525cf54d7 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -27,5 +27,9 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; + + # As of 2019-06-30, all of the dependencies are available on macOS but the + # package itself does not build. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index a6de278a7a7f..f1b6060e1663 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "ogre-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; - sha256 = "1hkkg5prixppiq1p5jz7wz1npm5s7kwm1s86079280waccvr2v6x"; + sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; }; cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 4749efb5f006..49daff30e7b5 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; homepage = https://matrix.org/git/olm/about; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; darwin ++ linux; }; src = fetchurl { @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { # requires optimisation but memory operations are compiled with -O0 hardeningDisable = ["fortify"]; + makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null; + installFlags = "PREFIX=$(out)"; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 5e78f9f92ecf..43a68abf8257 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 +, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let @@ -206,7 +206,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index b4ad2bcb8679..f96e6bf94bb0 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 +, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 123b8807a74f..784071c6e4d4 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -10,7 +10,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen -, cf-private, Cocoa, QTKit +, Cocoa, QTKit }: let @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen - ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit cf-private /* For NSDefaultRunLoopMode */ ] + ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 61d42e4452fc..e597a26dad9f 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl, libnl +{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings @@ -19,6 +19,14 @@ in stdenv.mkDerivation rec { sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; + patches = [ + (fetchpatch { + name = "openmpi-mca_btl_vader_component_close-segfault.patch"; + url = "https://github.com/open-mpi/ompi/pull/6526.patch"; + sha256 = "0s7ac9rkcj3fi6ampkvy76njlj478yyr4zvypjc7licy6dgr595x"; + }) + ]; + postPatch = '' patchShebangs ./ ''; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 57f1c9830a68..72e532ae7829 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.3"; + version = "3.4.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z"; + sha256 = "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix new file mode 100644 index 000000000000..c44695cb70a3 --- /dev/null +++ b/pkgs/development/libraries/packr/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "packr"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "gobuffalo"; + repo = pname; + rev = "v${version}"; + sha256 = "070hpnsr5w1r1cg9wl80cafmhkx4z3s29wq04fa7rk49hmwml4jy"; + }; + + modSha256 = "0xvpk9jjcqac44s4fp0jwpljxvs0ypjwc5qfg0w90s2r7jn50fxn"; + + meta = with lib; { + description = "The simple and easy way to embed static files into Go binaries"; + homepage = "https://github.com/gobuffalo/packr"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index fd2b9feff68b..331581294690 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake , qhull, flann, boost, vtk, eigen, pkgconfig, qtbase -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL +, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL }: stdenv.mkDerivation rec { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ]; - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 40ccd8cfd20b..c8dae0c2b51a 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.7.0"; + version = "2.7.2"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 7a89d61753d1..08afe6d64522 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.7.4"; + version = "1.7.7"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "0w9s3qv87hrmpq4dkrxcrl2hn2vcsbvy8ml99w85404wksw1dwrx"; + sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng"; }; pythonPath = []; # python wrapper support diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index c7d43ae70268..a7f5e03c7380 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.6"; + version = "1.5.8"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv"; + sha256 = "0dnsvyg990ln3bdjdyc5b4lbb63wcjij0skq8pb4x4jglfy7vz4z"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 34ef7463817d..afd2a01e722b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -14,7 +14,7 @@ , examples ? false , demos ? false # darwin support -, cf-private, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx +, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx }: let @@ -189,7 +189,7 @@ stdenv.mkDerivation rec { postgresql sqlite libjpeg libmng libtiff icu ] ++ lib.optionals (mysql != null) [ mysql.connector-c ] ++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ] - ++ lib.optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; nativeBuildInputs = [ perl pkgconfig which ]; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 9ef3364cd5c7..67c5047e5078 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`. stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, - cf-private, llvmPackages_5, + llvmPackages_5, # options developerBuild ? false, @@ -100,17 +100,13 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix { - inherit cf-private; - }; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix { }; - qtmacextras = callPackage ../modules/qtmacextras.nix { - inherit cf-private; - }; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 7a85202ced76..1fbf7b57289f 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`. stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, - cf-private, llvmPackages_5, + llvmPackages_5, # options developerBuild ? false, @@ -105,17 +105,13 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix { - inherit cf-private; - }; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; - qtmacextras = callPackage ../modules/qtmacextras.nix { - inherit cf-private; - }; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 2018488cee51..4f739b57ffec 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -29,7 +29,6 @@ existing packages here and modify it as necessary. stdenv, fetchurl, fetchpatch, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, - cf-private, # options developerBuild ? false, @@ -141,9 +140,7 @@ let /* qtactiveqt = not packaged */ /* qtandroidextras = not packaged */ /* qtcanvas3d = not packaged */ - qtconnectivity = callPackage ../modules/qtconnectivity.nix { - inherit cf-private; - }; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 373c1b7b9ba6..f36f86e26ffe 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -20,7 +20,6 @@ top-level attribute to `top-level/all-packages.nix`. stdenv, fetchurl, fetchpatch, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, - cf-private, # options developerBuild ? false, @@ -102,17 +101,13 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix { - inherit cf-private; - }; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; - qtmacextras = callPackage ../modules/qtmacextras.nix { - inherit cf-private; - }; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 2c050a105b85..458946b803d2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -78,8 +78,6 @@ stdenv.mkDerivation { [ libinput ] ++ lib.optional withGtk3 gtk3 ) - # Needed for OBJC_CLASS_$_NSDate symbols. - ++ lib.optional stdenv.isDarwin darwin.cf-private ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.connector-c diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 17e7f0ee7cff..36a736d03dc5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -1,8 +1,8 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, bluez, cf-private }: +{ qtModule, stdenv, qtbase, qtdeclarative, bluez }: qtModule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = if stdenv.isDarwin then [ cf-private ] else [ bluez ]; + buildInputs = stdenv.lib.optional stdenv.isLinux bluez; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 3f254885986e..11964caf17b1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -1,10 +1,8 @@ -{ stdenv, qtModule, qtbase, cf-private }: +{ stdenv, qtModule, qtbase }: qtModule { name = "qtmacextras"; - qtInputs = [ qtbase ] - # Needed for _OBJC_CLASS_$_NSData symbols. - ++ stdenv.lib.optional stdenv.isDarwin cf-private; + qtInputs = [ qtbase ]; meta = with stdenv.lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index aa9cdb4d5ae7..07fd048d6538 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -200,14 +200,6 @@ EOF (runCommand "MacOS_SDK_sandbox.h" {} '' install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h '') - - # For: - # _NSDefaultRunLoopMode - # _OBJC_CLASS_$_NSDate - # _OBJC_CLASS_$_NSDictionary - # _OBJC_CLASS_$_NSRunLoop - # _OBJC_CLASS_$_NSURL - darwin.cf-private ]); __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 40f4c56e8091..d65449023b34 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -28,7 +28,7 @@ qtModule { ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia ++ optional usingAnnulenWebkitFork qtwebchannel; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ]) + ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ]) ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index 6d5274cbc586..906d750c5d3f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -1,20 +1,14 @@ { darwin, stdenv, qtModule, qtdeclarative, qtwebengine }: with stdenv.lib; - + qtModule { name = "qtwebview"; qtInputs = [ qtdeclarative qtwebengine ]; buildInputs = optional (stdenv.isDarwin) [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.WebKit - - # For: - # _OBJC_CLASS_$_NSArray - # _OBJC_CLASS_$_NSDate - # _OBJC_CLASS_$_NSURL - darwin.cf-private ]; outputs = [ "out" "dev" "bin" ]; NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit"; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 8e1b9ae394b5..1b043d33ad6a 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage -, cf-private, IOKit, Foundation, AppKit, OpenAL +, IOKit, Foundation, AppKit, OpenAL }: let @@ -19,10 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libjpeg openal flac libvorbis glew ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL - # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate - cf-private - ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 16be9fa1e3b1..4d74c7e05598 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }: stdenv.mkDerivation rec { - name = "speexdsp-1.2rc3"; + name = "speexdsp-1.2.0"; src = fetchurl { url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; - sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja"; + sha256 = "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838"; }; patches = [ ./build-fix.patch ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b2351a32fa63..ea1c38ea476b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + name = "sqlite-${version}"; version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" ''; - enableParallelBuilding = true; doCheck = false; # fails to link against tcl meta = { diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index be09bb73b3aa..a65c6053f295 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -32,11 +32,9 @@ stdenv.mkDerivation { ++ stdenv.lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkgconfig ]; + buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); - propagatedBuildInputs = [ tcl libXft ] - ++ lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [ - Cocoa cf-private - ]); + propagatedBuildInputs = [ tcl libXft ]; doCheck = false; # fails. can't find itself diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix new file mode 100644 index 000000000000..552bd4c1c51d --- /dev/null +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "trompeloeil-${version}"; + version = "34"; + + src = fetchFromGitHub { + owner = "rollbear"; + repo = "trompeloeil"; + rev = "v${version}"; + sha256 = "0mj3zni18kfm04jrqjaa1p6ii5q0dz6qdm3hi57z9lzygaxbdc97"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Header only C++14 mocking framework"; + homepage = "https://github.com/rollbear/trompeloeil"; + license = licenses.boost; + maintainers = [ maintainers.bjornfor ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7d4c6c7a2994..7b72e12a66b2 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql55, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -67,7 +67,7 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mysql55 ]; + buildInputs = [ unixODBC mysql ]; cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9843b1289cfc..e2a82b7adcda 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -2,7 +2,7 @@ , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL -, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }: +, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: with stdenv.lib; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; }; - buildInputs = - if !stdenv.isDarwin - then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib - else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private - CFNetwork Security ApplicationServices CoreText IOSurface ImageIO - OpenGL GLUT ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; + buildInputs = [ cmake ] + ++ optional (qtLib != null) qtLib + ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ] + ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit + CFNetwork Security ApplicationServices CoreText + IOSurface ImageIO OpenGL GLUT ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; preBuild = '' diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 891ad373e027..a44e91e1bf5c 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; + patches = [ ./system-search-path.patch ]; + cmakeFlags = [ - "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/share" + "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/pkgs/development/libraries/vulkan-loader/system-search-path.patch new file mode 100644 index 000000000000..26f83e6d534f --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/system-search-path.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ac5ce835..cbdb0ff56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,6 +88,12 @@ if(UNIX) + STRING + "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." + ) ++ set( ++ SYSTEM_SEARCH_PATH "" ++ CACHE ++ STRING ++ "Search path to always use, after all other search paths." ++ ) + endif() + + if(UNIX AND NOT APPLE) # i.e.: Linux +@@ -184,6 +190,7 @@ if(UNIX) + add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") + add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") + add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") ++ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}") + + # Make sure /etc is searched by the loader + if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) +diff --git a/loader/loader.c b/loader/loader.c +index 0d3b5a947..abe357004 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e + search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size); + search_path_size += DetermineDataFilePathSize(home_root, rel_size); + } ++ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size); + #endif + } + } +@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e + CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr); + CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr); + } ++ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr); + } + + // Remove the last path separator diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 7a32aba24ff8..cbe8bd8ac5ee 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes -, cf-private, derez, rez, setfile +, derez, rez, setfile , AGL, Cocoa, Kernel }: @@ -16,15 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile - Cocoa Kernel - - # Needed for CFURLGetFSRef, etc. which have deen deprecated - # since 10.9 and are not part of swift-corelibs CoreFoundation. - cf-private + AGL Cocoa Kernel ]; - propagatedBuildInputs = [ AGL ]; - postPatch = '' substituteInPlace configure --replace "-framework System" -lSystem ''; @@ -71,6 +65,5 @@ stdenv.mkDerivation rec { homepage = https://www.wxwidgets.org/; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - broken = true; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 3a5638b22814..7fb5be1c3434 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -86,5 +86,5 @@ stdenv.mkDerivation (rec { export CHOST=${stdenv.hostPlatform.config} ''; } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { - configurePhase = ":"; + dontConfigure = true; }) |