diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/development/libraries/cxxtools | |
parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cxxtools')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/cxxtools/default.nix | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cxxtools/default.nix b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix index 50417dab1feb..8682c8ba8196 100644 --- a/nixpkgs/pkgs/development/libraries/cxxtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix @@ -1,22 +1,53 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, tzdata +, autoreconfHook +, openssl +}: stdenv.mkDerivation rec { - version = "2.2.1"; pname = "cxxtools"; + version = "3.0"; - src = fetchurl { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; + src = fetchFromGitHub { + owner = "maekitalo"; + repo = "cxxtools"; + rev = "V${version}"; + hash = "sha256-AiMVmtvI20nyv/nuHHxGH4xFnlc9AagVkKlnRlaYCPM="; }; - configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread"; + patches = [ + (fetchpatch { + url = "https://github.com/maekitalo/cxxtools/commit/b773c01fc13d2ae67abc0839888e383be23562fd.patch"; + hash = "sha256-9yRkD+vMRhc4n/Xh6SKtmllBrmfDx3IBVOtHQV6s7Tw="; + }) + (fetchpatch { + url = "https://github.com/maekitalo/cxxtools/commit/6e1439a108ce3892428e95f341f2d23ae32a590e.patch"; + hash = "sha256-ZnlbdWBjL9lEtNLEF/ZPa0IzvJ7i4xWI4GbY8KeA6A4="; + }) + ]; + + postPatch = '' + substituteInPlace src/tz.cpp \ + --replace '::getenv("TZDIR")' '"${tzdata}/share/zoneinfo"' + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + openssl + ]; enableParallelBuilding = true; meta = { homepage = "http://www.tntnet.org/cxxtools.html"; description = "Comprehensive C++ class library for Unix and Linux"; - platforms = lib.platforms.linux ; + platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.juliendehos ]; }; |