diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-17 19:14:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 19:14:44 +0100 |
| commit | 4e80055e97642ea827ca6ae3685911333257ad6d (patch) | |
| tree | 1bfd489c86122f4c157fd4d2d6ce2880a7e99515 /pkgs | |
| parent | ec45d9fde08dbd575be669ed0c3a8030e59c4b53 (diff) | |
| parent | 133fc77d70a88f920dc72fb721b422169c870983 (diff) | |
Merge pull request #273451 from wegank/cromfs-stdenv
cromfs: fix build with gcc 11+
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/archivers/cromfs/default.nix | 2 | ||||
| -rw-r--r-- | 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 899640d90c455..b775eb1561ef0 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 eb7f1a72e7960..ef62375dede76 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 { }; |