mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 15:15:36 +00:00
treewide: remove fmt from buildInputs where spdlog is used
spdlog_1 has fmt_8 in propagatedBuildInputs and having fmt which points to fmt_7 in buildInputs makes the builds use wrong fmt
This commit is contained in:
parent
f06cec9564
commit
b4fab0a98b
|
@ -13,7 +13,6 @@
|
|||
, sqlite
|
||||
, curl
|
||||
, libuchardet
|
||||
, fmt
|
||||
, spdlog
|
||||
}:
|
||||
|
||||
|
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
sqlite
|
||||
curl
|
||||
libuchardet
|
||||
fmt
|
||||
spdlog
|
||||
];
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
|
||||
, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
|
||||
, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:
|
||||
, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "far2l";
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];
|
||||
|
||||
buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build
|
||||
buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build
|
||||
++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
|
||||
#++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
, gtkmm3
|
||||
, libsigcxx
|
||||
, jsoncpp
|
||||
, fmt
|
||||
, scdoc
|
||||
, spdlog
|
||||
, gtk-layer-shell
|
||||
|
@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = false;
|
||||
|
||||
buildInputs = with lib;
|
||||
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
|
||||
[ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
|
||||
++ optional traySupport libdbusmenu-gtk3
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optional sndioSupport sndio
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
, mtxclient
|
||||
, boost17x
|
||||
, spdlog
|
||||
, fmt
|
||||
, olm
|
||||
, pkg-config
|
||||
, nlohmann_json
|
||||
|
@ -52,7 +51,6 @@ mkDerivation rec {
|
|||
libsecret
|
||||
lmdb
|
||||
spdlog
|
||||
fmt
|
||||
cmark
|
||||
qtbase
|
||||
qtmultimedia
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages
|
||||
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
|
||||
, fmt, graphviz, llvmPackages, z3
|
||||
, graphviz, llvmPackages, z3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ]
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ]
|
||||
++ (with python3Packages; [ python pybind11 ])
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vowpal-wabbit";
|
||||
|
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
boost
|
||||
flatbuffers
|
||||
fmt
|
||||
rapidjson
|
||||
spdlog
|
||||
zlib
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
, libcec, libcec_platform, dcadec, libuuid
|
||||
, libcrossguid, libmicrohttpd
|
||||
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1
|
||||
, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
|
||||
, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
|
||||
, lirc
|
||||
, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
|
||||
, dbusSupport ? true, dbus
|
||||
|
@ -125,7 +125,7 @@ in stdenv.mkDerivation {
|
|||
libgcrypt libgpg-error libunistring
|
||||
libcrossguid libplist
|
||||
bluez giflib glib harfbuzz lcms2 libpthreadstubs
|
||||
ffmpeg flatbuffers fmt fstrcmp rapidjson
|
||||
ffmpeg flatbuffers fstrcmp rapidjson
|
||||
lirc
|
||||
mesa # for libEGL
|
||||
]
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
, catch2
|
||||
, cmake
|
||||
, cython
|
||||
, fmt
|
||||
, muparserx
|
||||
, ninja
|
||||
, nlohmann_json
|
||||
|
@ -66,7 +65,6 @@ buildPythonPackage rec {
|
|||
buildInputs = [
|
||||
blas
|
||||
catch2
|
||||
fmt
|
||||
muparserx
|
||||
nlohmann_json
|
||||
spdlog
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
, openssl
|
||||
, nlohmann_json
|
||||
, gtest
|
||||
, fmt
|
||||
, spdlog
|
||||
, c-ares
|
||||
, abseil-cpp
|
||||
|
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
openssl
|
||||
nlohmann_json
|
||||
gtest
|
||||
fmt
|
||||
spdlog
|
||||
c-ares
|
||||
abseil-cpp
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
, cmake
|
||||
, pkg-config
|
||||
# required
|
||||
, fmt
|
||||
, libiconv
|
||||
, libupnp
|
||||
, libuuid
|
||||
|
@ -88,7 +87,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
fmt
|
||||
libiconv
|
||||
libupnp'
|
||||
libuuid
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
, judy
|
||||
, pam
|
||||
, spdlog
|
||||
, fmt
|
||||
, systemdMinimal
|
||||
, zlib # optional
|
||||
}:
|
||||
|
@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
|
||||
zlib boost judy pam spdlog fmt python3 systemdMinimal
|
||||
zlib boost judy pam spdlog python3 systemdMinimal
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue