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

Fix cfdg build

Browse Source
This commit is contained in:
Michael Raskin 2012-12-04 14:46:59 +04:00
parent 2ab2b27e93
commit 38323efd03
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/graphics/cfdg/default.nix
View File

@ -1,8 +1,8 @@
a @ {libpng, bison, flex, fullDepEntry, ...} : a @ {libpng, bison, flex, ffmpeg, fullDepEntry, ...} :
let let
s = import ./src-for-default.nix; s = import ./src-for-default.nix;
buildInputs = with a; [ buildInputs = with a; [
libpng bison flex libpng bison flex ffmpeg
]; ];
in in
rec { rec {
@ -13,7 +13,11 @@ rec {
configureFlags = []; configureFlags = [];
/* doConfigure should be removed if not needed */ /* 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 '' copyFiles = a.fullDepEntry ''
mkdir -p $out/bin mkdir -p $out/bin

1
pkgs/top-level/all-packages.nix
View File

@ -522,6 +522,7 @@ let
cfdg = builderDefsPackage ../tools/graphics/cfdg { cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex; inherit libpng bison flex;
ffmpeg = ffmpeg_1_0;
}; };
checkinstall = callPackage ../tools/package-management/checkinstall { }; checkinstall = callPackage ../tools/package-management/checkinstall { };