BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pflask: pull fix pending upstream inclusion for -fno-common support

Browse source 
Without the change build fails on upstream gcc-10 as:

    ld: src/util.c.1.o:/build/pflask/build/../src/printf.h:42: multiple definition of
      `use_syslog'; src/cgroup.c.1.o:/build/pflask/build/../src/printf.h:42: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-28 17:23:12 +01:00
parent 17b62c338f
commit 7327069ecc
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/os-specific/linux/pflask/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3, wafHook }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }:
stdenv.mkDerivation rec {
pname = "pflask";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg=";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/ghedo/pflask/pull/30
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/ghedo/pflask/commit/73ba32ec48e1e0e4a56b1bceed4635711526e079.patch";
hash = "sha256-KVuBS7LbYJQv6NXljpSiGGja7ar7W6A6SKzkEjB1B6U=";
})
];
nativeBuildInputs = [ python3 wafHook ];
postInstall = ''