diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
| commit | ed068b960eeedb92823238783779730319b8ba0e (patch) | |
| tree | 36a4de280458d52520b911b2716eb5cea309fd78 /gnu/packages/assembly.scm | |
| parent | a9308efec642bfbce480545a22fce848e6212456 (diff) | |
| parent | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (diff) | |
| download | patches-ed068b960eeedb92823238783779730319b8ba0e.tar patches-ed068b960eeedb92823238783779730319b8ba0e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/assembly.scm')
| -rw-r--r-- | gnu/packages/assembly.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 3f77dd756c..27db8fc559 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -34,14 +34,14 @@ (define-public nasm (package (name "nasm") - (version "2.12.02") + (version "2.13.01") (source (origin (method url-fetch) (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "08a3ah791cl7xdyrlz33mwv4xzs08rxh0p902p3ypi5iq1h6p1jc")))) + "0plsvcwxc7q3llr3bz10prwq1gn4ll38aqmv0yzfqcq4iw0160ma")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for doc and test target ("texinfo" ,texinfo))) @@ -52,10 +52,10 @@ (add-after 'unpack 'dont-build-ps-pdf-outputs (lambda _ (substitute* "doc/Makefile.in" - (("info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf") - "info html nasmdoc.txt") - (("nasmdoc.ps nasmdoc.pdf nasmdoc.txt \\$\\(INSTALLROOT\\)\\$\\(docdir\\)") - "nasmdoc.txt $(INSTALLROOT)$(docdir)")) + (("html nasmdoc.txt nasmdoc.pdf") + "html nasmdoc.txt") + (("\\$\\(INSTALL_DATA\\) nasmdoc.pdf") + "$(INSTALL_DATA)")) #t)) (add-after 'install 'install-info (lambda _ |