about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-02-28 13:17:10 +0000
committerOrivej Desh <orivej@gmx.fr>2020-02-28 13:17:10 +0000
commit8c1cb557c6dbd77281a2b16804310385faf27ca7 (patch)
tree8233ce04bf0ed41d5ff3b9492b48e9639b2b8090 /pkgs/development/libraries
parentddc2f887f5f4b31128e8d4a56cb524c1d36d6fd4 (diff)
downloadnixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.tar
nixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.tar.gz
nixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.tar.bz2
nixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.tar.lz
nixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.tar.xz
nixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.tar.zst
nixlib-8c1cb557c6dbd77281a2b16804310385faf27ca7.zip
fmt: 6.1.1 -> 6.1.2
Tests and parallel building are enabled by default.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/fmt/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 0c50b069d394..6eb6289d376d 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "6.1.1";
   pname = "fmt";
+  version = "6.1.2";
 
   src = fetchFromGitHub {
     owner = "fmtlib";
     repo = "fmt";
     rev = version;
-    sha256 = "0arii4hs33lqlbfwilnxiq8mqcvdwz66b24qa7fdjiga02j8kl2n";
+    sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi";
   };
 
   outputs = [ "out" "dev" ];
@@ -16,17 +16,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DFMT_TEST=TRUE"
-    "-DBUILD_SHARED_LIBS=TRUE"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
   ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
-  # preCheckHook ensures the test binaries can find libfmt.so
-  preCheck = ''
-    export LD_LIBRARY_PATH="$PWD"
-  '';
 
   meta = with stdenv.lib; {
     description = "Small, safe and fast formatting library";