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

Merge pull request #172756 from trofi/fix-cdpr-for-fno-common

Browse source 
cdpr: pull patch pending upstream inclusion for -fno-common
This commit is contained in:
Rick van Schijndel 2022-05-16 08:46:39 +02:00 committed by GitHub
commit 67221054c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/networking/cdpr/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libpcap }:
{ lib, stdenv, fetchurl, fetchpatch, libpcap }:
stdenv.mkDerivation rec {
pname = "cdpr";
@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj";
};
patches = [
# Pull fix pending upstream inclusion for gcc-10 compatibility:
# https://sourceforge.net/p/cdpr/bugs/3/
(fetchurl {
name = "fno-common";
url = "https://sourceforge.net/p/cdpr/bugs/3/attachment/0001-cdpr-fix-build-on-gcc-10-fno-common.patch";
sha256 = "023cvkpc4ry1pbjd91kkwj4af3hia0layk3fp8q40vh6mbr14pnp";
})
];
postPatch = ''
substituteInPlace Makefile --replace 'gcc' '"$$CC"'