diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/libraries/libthreadar | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libthreadar')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libthreadar/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/nixpkgs/pkgs/development/libraries/libthreadar/default.nix index 5a88d4ba2056..8e94275babfd 100644 --- a/nixpkgs/pkgs/development/libraries/libthreadar/default.nix +++ b/nixpkgs/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 }; } |