Unverified Commit f2c9cf39 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #145006 from Artturin/spdlogupd

parents 7fa8d14f b4fab0a9

pkgs/applications/misc/cherrytree/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
, sqlite

, curl

, libuchardet

, fmt

, spdlog

}:
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec { 
    sqlite

    curl

    libuchardet

    fmt

    spdlog

  ];

pkgs/applications/misc/far2l/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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

pkgs/applications/misc/waybar/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/instant-messengers/nheko/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -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

pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;