summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2022-05-14 17:15:21 +0200
committerThomas Gerbet <thomas@gerbet.me>2022-05-14 17:15:21 +0200
commit4929c80451ec2132a074a6e075a42efd3a2b2ddf (patch)
treee05b1fa6af50e627ad4e4de72a0198da4c6571b7 /pkgs/development
parent267e232035d0e5afc6fbfde86380e74f0f09b665 (diff)
downloadnixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.tar
nixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.tar.gz
nixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.tar.bz2
nixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.tar.lz
nixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.tar.xz
nixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.tar.zst
nixpkgs-4929c80451ec2132a074a6e075a42efd3a2b2ddf.zip
pe-parse: drop `no-sign-conversion` compile flag
Upstream has merged a patch to fix the issue so we can use that instead
of being lax when compiling.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/pe-parse/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix
index c8689d15e24..d9ccb4447b2 100644
--- a/pkgs/development/libraries/pe-parse/default.nix
+++ b/pkgs/development/libraries/pe-parse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
+{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "pe-parse";
@@ -11,10 +11,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch";
+      hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo=";
+    })
+  ];
 
-  # See https://github.com/trailofbits/pe-parse/issues/169
-  NIX_CFLAGS_COMPILE = "-Wno-sign-conversion";
+  nativeBuildInputs = [ cmake ];
 
   doInstallCheck = true;
   installCheckPhase = ''