diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e4190e98d4..cfa244c39b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2523,12 +2523,6 @@ (define-public restbed (home-page "https://github.com/Corvusoft/restbed") (license license:agpl3+)))) -(define fmt-restinio - (package - (inherit fmt) - (arguments - '(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fPIC"))))) - (define-public restinio (package (name "restinio") @@ -2553,7 +2547,7 @@ (define-public restinio ("sobjectizer" ,sobjectizer))) (propagated-inputs `(("asio", asio) - ("fmt" ,fmt-restinio) + ("fmt" ,fmt) ("http-parser", http-parser))) (arguments `(#:configure-flags '("-DRESTINIO_INSTALL=on") @@ -2592,7 +2586,7 @@ (define-public opendht ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) - ("fmt" ,fmt-restinio))) + ("fmt" ,fmt))) (propagated-inputs `(("argon2" ,argon2) ; TODO: Needed for the pkg-config .pc file to work? ("msgpack" ,msgpack))) ;included in several installed headers diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index cfe06a0be2..34d49938ac 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -174,6 +174,8 @@ (define-public fmt (base32 "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl")))) (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (native-inputs `(("unzip" ,unzip))) (home-page "http://fmtlib.net/") @@ -185,6 +187,13 @@ (define-public fmt ;; The library is bsd-2, but documentation and tests include other licenses. (license (list bsd-2 bsd-3 psfl)))) +(define-public fmt-restinio + (hidden-package + (package/inherit + fmt + (arguments + '(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fPIC")))))) + (define-public source-highlight (package (name "source-highlight")