colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #273685 from wegank/xc3sprog-gcc-13

Browse Source 
xc3sprog: fix build with gcc 11+
This commit is contained in:
Nick Cao 2023-12-12 08:41:10 -05:00 committed by GitHub
commit 9961d7819a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/embedded/xc3sprog/default.nix
View File

@ -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; {

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };