nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-13 01:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #240730 from doronbehar/pkg/spdlog-fmt

Browse Source 
spdlog: reformat expression arguments, and comment about fmt_9
This commit is contained in:
Doron Behar 2023-07-23 14:42:41 +00:00 committed by GitHub
commit d4f5099ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ let
# no stable hal release yet with recent spdlog/fmt support, remove
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
spdlog' = spdlog.override {
fmt = fmt_8.overrideAttrs (_: rec {
fmt_9 = fmt_8.overrideAttrs (_: rec {
version = "8.0.1";
src = fetchFromGitHub {
owner = "fmtlib";

12
pkgs/development/libraries/spdlog/default.nix
View File

@ -1,4 +1,12 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fmt
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
# Although we include upstream patches that fix compilation with fmt_10, we
# still use fmt_9 because this dependency is propagated, and many of spdlog's
# reverse dependencies don't support fmt_10 yet.
, fmt_9
, staticBuild ? stdenv.hostPlatform.isStatic
# tests
@ -29,7 +37,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ fmt ];
propagatedBuildInputs = [ fmt_9 ];
cmakeFlags = [
"-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"

4
pkgs/top-level/all-packages.nix
View File

@ -40969,9 +40969,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
spdlog = callPackage ../development/libraries/spdlog {
fmt = fmt_9;
};
spdlog = callPackage ../development/libraries/spdlog { };
dart = callPackage ../development/compilers/dart { };