diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/tools/graphics/cfdg/default.nix | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/cfdg/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/graphics/cfdg/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix index 9295bbe28d56..44a1e0d1d2a1 100644 --- a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix @@ -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 |