mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
Merge pull request #138920 from trofi/fix-upx-werror
upx: disable blanket -Werror (fix gcc-11 build)
This commit is contained in:
commit
77c55739cc
@ -8,15 +8,19 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7";
|
sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7";
|
||||||
};
|
};
|
||||||
|
|
||||||
CXXFLAGS = "-Wno-unused-command-line-argument";
|
|
||||||
|
|
||||||
buildInputs = [ ucl zlib perl ];
|
buildInputs = [ ucl zlib perl ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export UPX_UCLDIR=${ucl}
|
export UPX_UCLDIR=${ucl}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ];
|
makeFlags = [
|
||||||
|
"-C" "src"
|
||||||
|
"CHECK_WHITESPACE=true"
|
||||||
|
|
||||||
|
# Disable blanket -Werror. Triggers failues on minor gcc-11 warnings.
|
||||||
|
"CXXFLAGS_WERROR="
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
Loading…
Reference in New Issue
Block a user