diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-05 09:43:12 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-05 10:09:37 +0100 |
commit | 0a2ae78216d6afda43f59b96a4cf264cc3ef2993 (patch) | |
tree | 4fd6235f31ef3884c7881427b2b04c8a87dfd748 /pkgs | |
parent | 5c33b7350ba8709ea8033adb4bde55f7e4505da4 (diff) | |
download | nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.tar nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.tar.gz nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.tar.bz2 nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.tar.lz nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.tar.xz nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.tar.zst nixlib-0a2ae78216d6afda43f59b96a4cf264cc3ef2993.zip |
asympote: fix build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index e9f61228bedb..b4bb49758a42 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,7 +1,7 @@ a @ { freeglut,ghostscriptX,imagemagick,fftw, boehmgc,mesa,ncurses,readline,gsl,libsigsegv, - python,zlib, perl, texLive, texinfo, lzma, + python,zlib, perl, texLive, texinfo, xz, noDepEntry, fullDepEntry, fetchUrlFromSrcInfo, lib, @@ -20,7 +20,7 @@ let buildInputs = with a; [ freeglut ghostscriptX imagemagick fftw boehmgc mesa ncurses readline gsl libsigsegv python zlib - perl texLive texinfo lzma + perl texLive texinfo xz ]; in rec { @@ -54,7 +54,7 @@ rec { ''; 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/ '' ["minInit" "addInputs" "doUnpack"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3334ca96f45..0fb7e10c33cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,9 +429,9 @@ let asymptote = builderDefsPackage ../tools/graphics/asymptote { inherit freeglut ghostscriptX imagemagick fftw boehmgc mesa ncurses readline gsl libsigsegv python zlib perl - texinfo lzma; + texinfo xz; texLive = texLiveAggregationFun { - paths = [ texLive texLiveExtra ]; + paths = [ texLive texLiveExtra texLiveCMSuper ]; }; }; |