diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2023-10-18 11:35:39 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-18 11:35:39 +0000 |
commit | af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4 (patch) | |
tree | 5f51ba9b67dd700a13c534cfac18d06e10ad10aa /pkgs/applications/version-management | |
parent | b8d6d842d086ba02d79b7bc138b9f09c78864205 (diff) | |
parent | b9a38bf4f2dae7fe2f72975b15ba10bb70bf3aec (diff) | |
download | nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.tar nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.tar.gz nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.tar.bz2 nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.tar.lz nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.tar.xz nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.tar.zst nixpkgs-af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4.zip |
Merge pull request #261341 from trofi/monotone-gcc-14-fix
monotone: fix build for upcoming gcc-14
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/monotone/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 2db433b3f8c..56e23ee1f6b 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { revert = true; sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c"; }) + ./monotone-1.1-gcc-14.patch ]; postPatch = '' diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch b/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch new file mode 100644 index 00000000000..a5b79b6d02f --- /dev/null +++ b/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch @@ -0,0 +1,17 @@ +Unsetting __STRICT_ANSI__ is not a supported configuration for gcc +nowadays. gcc-14 started failing libstdc++ build as it uses gcc +extensions without __STRICT_ANSI__: https://gcc.gnu.org/PR111824 +--- a/src/base.hh ++++ b/src/base.hh +@@ -34,11 +34,6 @@ + #define WIN32_LEAN_AND_MEAN + #endif + +-// Cygwin somehow enables strict ansi, which we don't want. +-#ifdef __STRICT_ANSI__ +-#undef __STRICT_ANSI__ +-#endif +- + #include <iosfwd> + #include <string> // it would be nice if there were a <stringfwd> + |