mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge pull request #273685 from wegank/xc3sprog-gcc-13
xc3sprog: fix build with gcc 11+
This commit is contained in:
commit
9961d7819a
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
# fix build with gcc 11+
|
||||
"-DCMAKE_CXX_STANDARD=14"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -20382,7 +20382,7 @@ with pkgs;
|
|||
lua = lua5_4;
|
||||
};
|
||||
|
||||
xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; };
|
||||
xc3sprog = callPackage ../development/embedded/xc3sprog { };
|
||||
|
||||
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue