From 133fc77d70a88f920dc72fb721b422169c870983 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 01:44:20 +0100 Subject: [PATCH] cromfs: fix build with gcc 11+ --- pkgs/tools/archivers/cromfs/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 899640d90c45..b775eb1561ef 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse perl ]; + makeFlags = [ "CXXFLAGS=-std=c++03" ]; + meta = with lib; { description = "FUSE Compressed ROM filesystem with lzma"; homepage = "https://bisqwit.iki.fi/source/cromfs.html"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..021b8008deb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7299,9 +7299,7 @@ with pkgs; cringify = callPackage ../tools/text/cringify { }; - cromfs = callPackage ../tools/archivers/cromfs { - stdenv = gcc10StdenvCompat; - }; + cromfs = callPackage ../tools/archivers/cromfs { }; cron = callPackage ../tools/system/cron { };