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

asympote: fix build

Browse Source
This commit is contained in:
Vladimír Čunát 2014-01-05 09:43:12 +01:00
parent 5c33b7350b
commit 0a2ae78216
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/graphics/asymptote/default.nix
View File

@ -1,7 +1,7 @@
a @ { a @ {
freeglut,ghostscriptX,imagemagick,fftw, freeglut,ghostscriptX,imagemagick,fftw,
boehmgc,mesa,ncurses,readline,gsl,libsigsegv, boehmgc,mesa,ncurses,readline,gsl,libsigsegv,
python,zlib, perl, texLive, texinfo, lzma, python,zlib, perl, texLive, texinfo, xz,
noDepEntry, fullDepEntry, fetchUrlFromSrcInfo, noDepEntry, fullDepEntry, fetchUrlFromSrcInfo,
lib, lib,
@ -20,7 +20,7 @@ let
buildInputs = with a; [ buildInputs = with a; [
freeglut ghostscriptX imagemagick fftw boehmgc freeglut ghostscriptX imagemagick fftw boehmgc
mesa ncurses readline gsl libsigsegv python zlib mesa ncurses readline gsl libsigsegv python zlib
perl texLive texinfo lzma perl texLive texinfo xz
]; ];
in in
rec { rec {
@ -54,7 +54,7 @@ rec {
''; '';
extractTexinfoTex = a.fullDepEntry '' extractTexinfoTex = a.fullDepEntry ''
lzma -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex xz -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
cp texinfo-*/doc/texinfo.tex doc/ cp texinfo-*/doc/texinfo.tex doc/
'' ["minInit" "addInputs" "doUnpack"]; '' ["minInit" "addInputs" "doUnpack"];

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

@ -429,9 +429,9 @@ let
asymptote = builderDefsPackage ../tools/graphics/asymptote { asymptote = builderDefsPackage ../tools/graphics/asymptote {
inherit freeglut ghostscriptX imagemagick fftw boehmgc inherit freeglut ghostscriptX imagemagick fftw boehmgc
mesa ncurses readline gsl libsigsegv python zlib perl mesa ncurses readline gsl libsigsegv python zlib perl
texinfo lzma; texinfo xz;
texLive = texLiveAggregationFun { texLive = texLiveAggregationFun {
paths = [ texLive texLiveExtra ]; paths = [ texLive texLiveExtra texLiveCMSuper ];
}; };
}; };