about summary refs log tree commit diff
path: root/pkgs/applications/version-management/monotone
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-05-20 21:38:52 +0100
committerRobert Scott <code@humanleg.org.uk>2022-05-20 21:43:56 +0100
commit335334d1c65fc86a0c2922fdf6417473da5bdf5d (patch)
tree491a679883596aefffdc18e0d94774eaaf2a9b9b /pkgs/applications/version-management/monotone
parent6fe704d008a9254238f99f171cb36600ec5fade7 (diff)
monotone: add patch reverting old clang hack
modern clang has __float128 and the old declaration hack causes a
build failure
Diffstat (limited to 'pkgs/applications/version-management/monotone')
-rw-r--r--pkgs/applications/version-management/monotone/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 34c3e611d4059..6f62a381a5045 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -2,6 +2,7 @@
 , lua, pcre, sqlite, perl, pkg-config, expect, less
 , bzip2, gmp, openssl
 , autoreconfHook, texinfo
+, fetchpatch
 }:
 
 let
@@ -33,6 +34,12 @@ stdenv.mkDerivation rec {
   patches = [
     ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
     ./monotone-1.1-adapt-to-botan2.patch
+    (fetchpatch {
+      name = "rm-clang-float128-hack.patch";
+      url = "https://github.com/7c6f434c/monotone-mirror/commit/5f01a3a9326a8dbdae7fc911b208b7c319e5f456.patch";
+      revert = true;
+      sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c";
+    })
   ];
 
   postPatch = ''