about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-03-23 04:06:02 +0100
committerGitHub <noreply@github.com>2022-03-23 04:06:02 +0100
commitc4be9ee24aa42a080f18a099ed47ec038d38d9ac (patch)
treed9324ea43416e56597583ed5366edef2ffade0e7
parent1fb09c3c2e185080af4217d102ca0f5b56f76f0f (diff)
parent6475ad4ea8b47849b0d54cc89856ccf45964ed07 (diff)
downloadnixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.tar
nixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.tar.gz
nixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.tar.bz2
nixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.tar.lz
nixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.tar.xz
nixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.tar.zst
nixlib-c4be9ee24aa42a080f18a099ed47ec038d38d9ac.zip
Merge pull request #164403 from Izorkin/update-libthreadar
-rw-r--r--pkgs/development/libraries/libthreadar/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
index 5a88d4ba2056..8e94275babfd 100644
--- a/pkgs/development/libraries/libthreadar/default.nix
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -1,18 +1,20 @@
-{ lib, stdenv, fetchurl }:
-
-with lib;
+{ lib, stdenv, fetchurl, gcc-unwrapped }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.5";
+  version = "1.4.0";
   pname = "libthreadar";
 
   src = fetchurl {
     url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
-    sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8=";
+    sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E=";
   };
 
   outputs = [ "out" "dev" ];
 
+  buildInputs = [ gcc-unwrapped ];
+
+  CXXFLAGS = [ "-std=c++14" ];
+
   configureFlags = [
     "--disable-build-html"
   ];
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
     rm -r "$out"/share
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "http://libthreadar.sourceforge.net/";
     description = "A C++ library that provides several classes to manipulate threads";
     longDescription = ''
@@ -32,6 +34,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ izorkin ];
     license = licenses.lgpl3;
     platforms = platforms.unix;
-    broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libthreadar.x86_64-darwin
   };
 }