summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-06-20 21:12:25 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-06-20 22:16:45 +0200
commit3f56740d7231b98d7b0100233d965d82e17cfede (patch)
tree368a08fcd01c83d6e33ccf6c0a4f757afad26ea6
parentfe435b3af624edab4c5b25bed65baa03ba0dd38b (diff)
downloadguix-3f56740d7231b98d7b0100233d965d82e17cfede.tar.gz
gnu: nasm: Update to 2.13.01.
* gnu/packages/assembly.scm (nasm): Update to 2.13.01.
[arguments]: Adjust Makefile substitutions.
-rw-r--r--gnu/packages/assembly.scm12
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 _