diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
18 files changed, 110 insertions, 104 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index b31a0703a031..d82b25fb8926 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles +{ stdenv, config, libGLSupported, fetchurl, pkgconfig , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux, alsaLib , x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./find-headers.patch ]; - nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index 59ffd47c3104..76df9514cf4a 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { name = "freetype-${version}"; - version = "2.9"; + version = "2.9.1"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; + sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ]; # native compiler to generate building tool CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; @@ -68,4 +68,5 @@ in stdenv.mkDerivation rec { wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; + } diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 024ccf2a4537..62963283f937 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -72,6 +72,11 @@ stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; }) + # https://gitlab.gnome.org/GNOME/glib/issues/1645 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; + sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh b/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh index 5275529991f7..a1cb1f40c58a 100644 --- a/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/glib/setup-hook.sh @@ -15,9 +15,9 @@ preInstallPhases+=" glibPreInstallPhase" glibPreFixupPhase() { # Move gschemas in case the install flag didn't help - if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then + if [ -d "$prefix/share/glib-2.0/schemas" ]; then mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0" - mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" + mv "$prefix/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" fi addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" diff --git a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix index 3b9fbc35a768..00bfb55520dc 100644 --- a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix +++ b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix @@ -29,17 +29,14 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; dontDisableStatic = withStatic; diff --git a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index 23a69282b41c..ce78f3230882 100644 --- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -30,18 +30,15 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; # not cross; dontDisableStatic = withStatic; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix index b131acf5f5ef..dc0675db2cde 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.2"; + version = "3.24.3"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"; + sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p"; }; outputs = [ "out" "dev" ]; @@ -35,16 +35,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1521 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch; - sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl"; - }) - # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1523 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch; - sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index cdc03c01a022..25cee4ef8daa 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index 43d40b4a2a0e..27eba7f4f488 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1riircgrj002w1sd1053aq9098s6ys99gya0k0crhb9f3ij2kwx4"; + sha256 = "08vid3q1la3qiv9d5xcgxznjahzs8w01fhabvxlvzwqf04qnhjvx"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 14b01cd9a843..ebcf51dfd030 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -13,11 +13,17 @@ stdenv.mkDerivation rec { stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch ++ [ + ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321 (fetchpatch { name = "cve-2018-19664.diff"; url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; }) + (fetchpatch { + name = "CVE-2018-20330.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; + sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch new file mode 100644 index 000000000000..c0f7fef44938 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES}) + + add_test(djpeg-${libtype}-rgb-islow-icc-cmp + ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc) ++ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES ++ DEPENDS djpeg-${libtype}-rgb-islow) + + add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" + testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index 4fed33a4d357..10a2124199b2 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,23 +1,16 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.23.2"; + version = "1.24.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7"; + sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab"; }; - patches = [ - (fetchpatch { - url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch"; - sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; - }) - ]; - postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -52,6 +45,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix index dd3703e6aebd..52359a3a4cd6 100644 --- a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isLinux "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; + NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null; + installFlags = [ "moduledir=$(out)/lib/vdpau" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch index 8f5b5d4790fb..cfa68eb8102c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch @@ -18,6 +18,19 @@ index 005db4248..685c5b1b2 100644 // env import paths if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +index 56cb3fb55..74509d601 100644 +--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake ++++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) + + find_package(Qt5 COMPONENTS Qml Core) + +- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen") ++ set(compiler_path "qmlcachegen") + + get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 8bba26efd35f..68439f5921d8 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config, coreutils +{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). , blas64 ? null - -# Select a specifc optimization target (other than the default) +, buildPackages +# Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt , target ? null }: @@ -19,54 +19,46 @@ let # To add support for a new platform, add an element to this set. configs = { armv6l-linux = { - BINARY = "32"; + BINARY = 32; TARGET = setTarget "ARMV6"; - DYNAMIC_ARCH = "0"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = false; + USE_OPENMP = true; }; armv7l-linux = { - BINARY = "32"; + BINARY = 32; TARGET = setTarget "ARMV7"; - DYNAMIC_ARCH = "0"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = false; + USE_OPENMP = true; }; aarch64-linux = { - BINARY = "64"; + BINARY = 64; TARGET = setTarget "ARMV8"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; i686-linux = { - BINARY = "32"; + BINARY = 32; TARGET = setTarget "P2"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; x86_64-darwin = { - BINARY = "64"; + BINARY = 64; TARGET = setTarget "ATHLON"; - DYNAMIC_ARCH = "1"; - # Note that clang is available through the stdenv on OSX and - # thus is not an explicit dependency. - CC = "clang"; - USE_OPENMP = "0"; + DYNAMIC_ARCH = true; + USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "10.7"; }; x86_64-linux = { - BINARY = "64"; + BINARY = 64; TARGET = setTarget "ATHLON"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; }; in @@ -85,25 +77,16 @@ let in stdenv.mkDerivation rec { name = "openblas-${version}"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "1jdq4msfyg13pdmwwfqpixf4fshss68qzls820lmn0i6y7h4aix3"; + sha256 = "0hwfplr6ciqjvfqkya5vz92z2rx8bhdg5mkh923z246ylhs6d94k"; }; inherit blas64; - patches = [ - # Fixes build on x86_64-darwin. See: - # https://github.com/xianyi/OpenBLAS/issues/1926 - (fetchpatch { - url = https://github.com/xianyi/OpenBLAS/commit/701ea88347461e4c5d896765438dc870281b3834.patch; - sha256 = "18rcfgkjsijl9d2510jn961wqvz7zdlz2fgy1yjmax29kvv8fqd9"; - }) - ]; - # Some hardening features are disabled due to sporadic failures in # OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but # with how these flags interact with hardening measures used downstream. @@ -119,19 +102,24 @@ stdenv.mkDerivation rec { "relro" "bindnow" ]; - nativeBuildInputs = - [gfortran perl which] - ++ optionals stdenv.isDarwin [coreutils]; - - makeFlags = - [ - "FC=gfortran" - ''PREFIX="''$(out)"'' - "NUM_THREADS=64" - "INTERFACE64=${if blas64 then "1" else "0"}" - "NO_STATIC=1" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" - ++ mapAttrsToList (var: val: var + "=" + val) config; + nativeBuildInputs = [ + perl + which + buildPackages.gfortran + buildPackages.stdenv.cc + ]; + + makeFlags = mapAttrsToList (var: val: "${var}=${toString val}") (config // { + FC = "${stdenv.cc.targetPrefix}gfortran"; + CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}"; + PREFIX = placeholder "out"; + NUM_THREADS = 64; + INTERFACE64 = blas64; + NO_STATIC = true; + CROSS = stdenv.hostPlatform != stdenv.buildPlatform; + HOSTCC = "cc"; + NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform; + }); doCheck = true; checkTarget = "tests"; diff --git a/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix b/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix index 4ea7de0b1a38..2708e49eb2b6 100644 --- a/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_LDFLAGS = [ "-lsqlite3" ]; + meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = https://www.gaia-gis.it/fossil/spatialite-tools; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix index 9030149fc8ad..04758ace7fa4 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex -, pkgconfig, which, gettext, gobject-introspection, pruneLibtoolFiles +, pkgconfig, which, gettext, gobject-introspection , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , gst-plugins-base, libobjc @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl python ruby bison gperf flex - pkgconfig which gettext gobject-introspection pruneLibtoolFiles + pkgconfig which gettext gobject-introspection ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 8baa6b0fc836..aa05161d19c0 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.22.5"; + version = "2.22.6"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "04ybyvaz5xhfkd2k65pc0sqizngjvd82j1p56wz3lz4a84zqdlwr"; + sha256 = "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z"; }; patches = optionals stdenv.isDarwin [ |