public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-17 07:01:38 -07:00
parent 3ff6965554 631cbc3de7
commit c227fb4b17
113 changed files with 1041 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/cfdg/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }:
{ lib, stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }:
stdenv.mkDerivation rec {
pname = "cfdg";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh";
};
buildInputs = [ libpng bison flex ffmpeg_3 icu ];
buildInputs = [ libpng bison flex ffmpeg icu ];
postPatch = ''
sed -e "/YY_NO_UNISTD/a#include <stdio.h>" -i src-common/cfdg.l