summary refs log tree commit diff
diff options
context:
space:
mode:
author7c6f434c <7c6f434c@mail.ru>2021-11-22 15:56:29 +0000
committerGitHub <noreply@github.com>2021-11-22 15:56:29 +0000
commit6dfdb123caf64f0f60799c99d5a3e6b7216cae61 (patch)
treec529e36df5792f041f8e8cdee53275921ed0d763
parent263ef4cc4146c9fab808085487438c625d4426a9 (diff)
parented869fb4176c5048ee0f292245916341acbb9beb (diff)
Merge pull request #146982 from trofi/fix-advancecomp-for-gcc-11
advancecomp: pull upstream patch for gcc-11 support
-rw-r--r--pkgs/tools/compression/advancecomp/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 7f8733b9b4ec0..00ce6af1d593b 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
       sha256 = "0cdv9g87c1y8zwhqkd9ba2zjw4slcvg7yzcqv43idvnwb5fl29n7";
       excludes = [ "doc/history.d" ];
     })
+
+    # Pull upstream fix for gcc-11:
+    (fetchpatch {
+      name = "gcc-11.patch";
+      url = "https://github.com/amadvance/advancecomp/commit/7b08f7a2af3f66ab95437e4490499cebb20e5e41.patch";
+      sha256 = "0gpppq6b760m1429g7d808ipdgb4lrqc1b6xk2457y66pbaiwc9s";
+    })
   ];
 
   # autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning