diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-04 14:46:59 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-04 14:46:59 +0400 |
| commit | 38323efd03d1f66e28c8f59085383a8e23e4192f (patch) | |
| tree | fa9434a20979c114e2ed73f8a1f96c5b91e1084e | |
| parent | 2ab2b27e939d0067a7179be07fb9cf6657d54b7e (diff) | |
| download | nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.tar nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.tar.gz nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.tar.bz2 nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.tar.lz nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.tar.xz nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.tar.zst nixpkgs-38323efd03d1f66e28c8f59085383a8e23e4192f.zip | |
Fix cfdg build
| -rw-r--r-- | pkgs/tools/graphics/cfdg/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 26df8818b2b..9376ad6a709 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -1,8 +1,8 @@ -a @ {libpng, bison, flex, fullDepEntry, ...} : +a @ {libpng, bison, flex, ffmpeg, fullDepEntry, ...} : let s = import ./src-for-default.nix; buildInputs = with a; [ - libpng bison flex + libpng bison flex ffmpeg ]; in rec { @@ -13,8 +13,12 @@ rec { configureFlags = []; /* doConfigure should be removed if not needed */ - phaseNames = ["doMake" "copyFiles"]; - + phaseNames = ["doFixInc" "doMake" "copyFiles"]; + + doFixInc = a.fullDepEntry '' + sed -e "/YY_NO_UNISTD/a#include <stdio.h>" -i src-common/cfdg.l + '' ["doUnpack" "minInit"]; + copyFiles = a.fullDepEntry '' mkdir -p $out/bin cp cfdg $out/bin/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0635660e550..ce2b80b2bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -522,6 +522,7 @@ let cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex; + ffmpeg = ffmpeg_1_0; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; |