cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #273446 from wegank/tracebox-stdenv

Browse source 
tracebox: fix build with gcc 11+
This commit is contained in:
Weijia Wang 2023-12-21 05:28:33 +01:00 committed by GitHub
commit 91991c44cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/networking/tracebox/default.nix
View file

@ -37,8 +37,11 @@ stdenv.mkDerivation rec {
"--with-libpcap=yes"
];
PCAPLIB="-lpcap";
LUA_LIB="-llua";
env = {
CXXFLAGS = "-std=c++14";
LUA_LIB = "-llua";
PCAPLIB = "-lpcap";
};
enableParallelBuilding = true;

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

@ -14114,7 +14114,7 @@ with pkgs;
traceroute = callPackage ../tools/networking/traceroute { };
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
tracebox = callPackage ../tools/networking/tracebox { };
tracee = callPackage ../tools/security/tracee {
clang = clang_14;