ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: All snippets report errors using exceptions, else return #t.

Browse source 
* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
gnu/packages/backup.scm, gnu/packages/base.scm,
gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm,
gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm,
gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm,
gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm,
gnu/packages/emulators.scm, gnu/packages/engineering.scm,
gnu/packages/enlightenment.scm, gnu/packages/fpga.scm,
gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm,
gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm,
gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm,
gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm,
gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm,
gnu/packages/lxde.scm, gnu/packages/machine-learning.scm,
gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm,
gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm,
gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm,
gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm,
gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm,
gnu/packages/pretty-print.scm, gnu/packages/profiling.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm,
gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm,
gnu/packages/scribus.scm, gnu/packages/sdl.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm,
gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm,
gnu/packages/terminals.scm, gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm, gnu/packages/textutils.scm,
gnu/packages/tls.scm, gnu/packages/unrtf.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm:
In all snippets, report errors using exceptions, or else return #t.
This commit is contained in:
Mark H Weaver 2018-03-16 07:47:34 -04:00
parent 1e5005e2ee
commit 6cbee49d66
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
89 changed files with 814 additions and 537 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gnu/packages/admin.scm
View file

@ -893,13 +893,15 @@ (define-public rottlog
"0751mb9l2f0jrk3vj6q8ilanifd121dliwk0c34g8k0dlzsv3kd7")) "0751mb9l2f0jrk3vj6q8ilanifd121dliwk0c34g8k0dlzsv3kd7"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile.in" '(begin
(("-o \\$\\{LOG_OWN\\} -g \\$\\{LOG_GROUP\\}") (substitute* "Makefile.in"
;; Don't try to chown root. (("-o \\$\\{LOG_OWN\\} -g \\$\\{LOG_GROUP\\}")
"") ;; Don't try to chown root.
(("mkdir -p \\$\\(ROTT_STATDIR\\)") "")
;; Don't attempt to create /var/lib/rottlog. (("mkdir -p \\$\\(ROTT_STATDIR\\)")
"true"))))) ;; Don't attempt to create /var/lib/rottlog.
"true"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location '(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location
@ -963,7 +965,9 @@ (define-public sudo
"00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj")) "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "lib/zlib")))) '(begin
(delete-file-recursively "lib/zlib")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1357,9 +1361,11 @@ (define-public direvent
(base32 (base32
"1nwvjmx7kb14ni34c0b8x9a3791pc20gvhj7xaj66d8q4h6n0qf4")) "1nwvjmx7kb14ni34c0b8x9a3791pc20gvhj7xaj66d8q4h6n0qf4"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(substitute* "tests/testsuite" (snippet '(begin
(("#![[:blank:]]?/bin/sh") (substitute* "tests/testsuite"
"#!$SHELL"))))) (("#![[:blank:]]?/bin/sh")
"#!$SHELL"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -1747,14 +1753,16 @@ (define-public nmap
"08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8")) "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(map delete-file-recursively '(begin
;; Remove bundled lua, pcap, and pcre libraries. (for-each delete-file-recursively
;; FIXME: Remove bundled liblinear once packaged. ;; Remove bundled lua, pcap, and pcre libraries.
'("liblua" ;; FIXME: Remove bundled liblinear once packaged.
"libpcap" '("liblua"
"libpcre" "libpcap"
;; Remove pre-compiled binares. "libpcre"
"mswin32"))))) ;; Remove pre-compiled binares.
"mswin32"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("openssl" ,openssl) `(("openssl" ,openssl)
@ -2055,7 +2063,9 @@ (define-public sunxi-tools
(snippet (snippet
;; Remove binaries contained in the tarball which are only for the ;; Remove binaries contained in the tarball which are only for the
;; target and can be regenerated anyway. ;; target and can be regenerated anyway.
'(delete-file-recursively "bin")) '(begin
(delete-file-recursively "bin")
#t))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)

3
gnu/packages/algebra.scm
View file

@ -730,7 +730,8 @@ (define-public eigen
;; See ;; See
;; https://bitbucket.org/eigen/eigen/commits/ea8c22ce6920e982d15245ee41d0531a46a28e5d ;; https://bitbucket.org/eigen/eigen/commits/ea8c22ce6920e982d15245ee41d0531a46a28e5d
((".*svd_preallocate[^\n]*" &) ((".*svd_preallocate[^\n]*" &)
(string-append "//" & " // Not supported by BDCSVD"))))))) (string-append "//" & " // Not supported by BDCSVD")))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(;; Turn off debugging symbols to save space. '(;; Turn off debugging symbols to save space.

19
gnu/packages/audio.scm
View file

@ -209,7 +209,8 @@ (define-public ardour
"libs/ardour/revision.cc" "libs/ardour/revision.cc"
(lambda (port) (lambda (port)
(format port ,(string-append "#include \"ardour/revision.h\" (format port ,(string-append "#include \"ardour/revision.h\"
namespace ARDOUR { const char* revision = \"" version "\" ; }"))))) namespace ARDOUR { const char* revision = \"" version "\" ; }"))
#t)))
(sha256 (sha256
(base32 (base32
"0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr")) "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"))
@ -510,7 +511,9 @@ (define-public espeak
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; remove prebuilt binaries ;; remove prebuilt binaries
'(delete-file-recursively "linux_32bit")))) '(begin
(delete-file-recursively "linux_32bit")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
@ -2745,8 +2748,10 @@ (define-public zita-convolver
version ".tar.bz2")) version ".tar.bz2"))
(snippet (snippet
;; Don't optimize for a specific processor architecture. ;; Don't optimize for a specific processor architecture.
'(substitute* "libs/Makefile" '(begin
(("^CXXFLAGS \\+= -march=native") ""))) (substitute* "libs/Makefile"
(("^CXXFLAGS \\+= -march=native") ""))
#t))
(modules '((guix build utils))) (modules '((guix build utils)))
(sha256 (sha256
(base32 (base32
@ -2790,8 +2795,10 @@ (define-public zita-resampler
version ".tar.bz2")) version ".tar.bz2"))
(snippet (snippet
;; Don't optimize for a specific processor architecture. ;; Don't optimize for a specific processor architecture.
'(substitute* '("apps/Makefile" "libs/Makefile") '(begin
(("^CXXFLAGS \\+= -march=native") ""))) (substitute* '("apps/Makefile" "libs/Makefile")
(("^CXXFLAGS \\+= -march=native") ""))
#t))
(modules '((guix build utils))) (modules '((guix build utils)))
(sha256 (sha256
(base32 (base32

3
gnu/packages/backup.scm
View file

@ -465,7 +465,8 @@ (define-public borg
;; Remove bundled shared libraries. ;; Remove bundled shared libraries.
(with-directory-excursion "src/borg/algorithms" (with-directory-excursion "src/borg/algorithms"
(for-each delete-file-recursively (for-each delete-file-recursively
(list "blake2" "lz4" "zstd"))))))) (list "blake2" "lz4" "zstd")))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:modules ((srfi srfi-26) ; for cut `(#:modules ((srfi srfi-26) ; for cut

16
gnu/packages/base.scm
View file

@ -556,9 +556,11 @@ (define-public glibc/linux
;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is
;; required on LFS distros to avoid loading the distro's libc.so ;; required on LFS distros to avoid loading the distro's libc.so
;; instead of ours. ;; instead of ours.
'(substitute* "sysdeps/unix/sysv/linux/configure" '(begin
(("use_ldconfig=yes") (substitute* "sysdeps/unix/sysv/linux/configure"
"use_ldconfig=no"))) (("use_ldconfig=yes")
"use_ldconfig=no"))
#t))
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
@ -1190,9 +1192,11 @@ (define-public libiconv
(snippet (snippet
;; Work around "declared gets" error on glibc systems (fixed by ;; Work around "declared gets" error on glibc systems (fixed by
;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.) ;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.)
'(substitute* "srclib/stdio.in.h" '(begin
(("^#undef gets") "") (substitute* "srclib/stdio.in.h"
(("^_GL_WARN_ON_USE \\(gets.*") ""))))) (("^#undef gets") "")
(("^_GL_WARN_ON_USE \\(gets.*") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Character set conversion library") (synopsis "Character set conversion library")
(description (description

88
gnu/packages/bioinformatics.scm
View file

@ -295,9 +295,10 @@ (define-public bcftools
"0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz")) "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"))
(patches (search-patches "bcftools-regidx-unsigned-char.patch")) (patches (search-patches "bcftools-regidx-unsigned-char.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Delete bundled htslib. ;; Delete bundled htslib.
'(delete-file-recursively "htslib-1.5")))) (delete-file-recursively "htslib-1.5")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -1194,10 +1195,12 @@ (define-public bowtie
"0hwa5r9qbglppb7sz5z79rlmmddr3n51n468jb3wh8rwjgn3yr90")) "0hwa5r9qbglppb7sz5z79rlmmddr3n51n468jb3wh8rwjgn3yr90"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(begin
;; replace BUILD_HOST and BUILD_TIME for deterministic build (substitute* "Makefile"
(("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"") ;; replace BUILD_HOST and BUILD_TIME for deterministic build
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))))) (("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("perl" ,perl) `(("perl" ,perl)
@ -1391,10 +1394,12 @@ (define-public python2-bx-python
"15z2w3bvnc0n4qmb9bd6d8ylc2h2nj883x2w9iixf4x3vki9b22i")) "15z2w3bvnc0n4qmb9bd6d8ylc2h2nj883x2w9iixf4x3vki9b22i"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "setup.py" '(begin
;; remove dependency on outdated "distribute" module (substitute* "setup.py"
(("^from distribute_setup import use_setuptools") "") ;; remove dependency on outdated "distribute" module
(("^use_setuptools\\(\\)") ""))))) (("^from distribute_setup import use_setuptools") "")
(("^use_setuptools\\(\\)") ""))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ;tests fail because test data are not included `(#:tests? #f ;tests fail because test data are not included
@ -1426,9 +1431,11 @@ (define-public python-pysam
(base32 (base32
"0dzap2axin9cbbl0d825w294bpn00zagfm1sigamm4v2pm5bj9lp")) "0dzap2axin9cbbl0d825w294bpn00zagfm1sigamm4v2pm5bj9lp"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Drop bundled htslib. TODO: Also remove samtools and bcftools. ;; Drop bundled htslib. TODO: Also remove samtools
'(delete-file-recursively "htslib")))) ;; and bcftools.
(delete-file-recursively "htslib")
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
@ -1800,9 +1807,10 @@ (define-public crossmap
;; for download from Sourceforge, but it has not been merged. ;; for download from Sourceforge, but it has not been merged.
(patches (search-patches "crossmap-allow-system-pysam.patch")) (patches (search-patches "crossmap-allow-system-pysam.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; remove bundled copy of pysam (snippet '(begin
(snippet ;; remove bundled copy of pysam
'(delete-file-recursively "lib/pysam")))) (delete-file-recursively "lib/pysam")
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
@ -1911,7 +1919,8 @@ (define-public python-pybigwig
(snippet (snippet
'(begin '(begin
;; Delete bundled libBigWig sources ;; Delete bundled libBigWig sources
(delete-file-recursively "libBigWig"))))) (delete-file-recursively "libBigWig")
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -3785,9 +3794,11 @@ (define-public mash
"08znbvqq5xknfhmpp3wcj574zvi4p7i8zifi67c9qw9a6ikp42fj")) "08znbvqq5xknfhmpp3wcj574zvi4p7i8zifi67c9qw9a6ikp42fj"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled kseq. '(begin
;; TODO: Also delete bundled murmurhash and open bloom filter. ;; Delete bundled kseq.
'(delete-file "src/mash/kseq.h")))) ;; TODO: Also delete bundled murmurhash and open bloom filter.
(delete-file "src/mash/kseq.h")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests. `(#:tests? #f ; No tests.
@ -3965,18 +3976,19 @@ (define-public miso
(base32 (base32
"1z3x0vd8ma7pdrnywj7i3kgwl89sdkwrrn62zl7r5calqaq2hyip")) "1z3x0vd8ma7pdrnywj7i3kgwl89sdkwrrn62zl7r5calqaq2hyip"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(substitute* "setup.py" (substitute* "setup.py"
;; Use setuptools, or else the executables are not ;; Use setuptools, or else the executables are not
;; installed. ;; installed.
(("distutils.core") "setuptools") (("distutils.core") "setuptools")
;; use "gcc" instead of "cc" for compilation ;; use "gcc" instead of "cc" for compilation
(("^defines") (("^defines")
"cc.set_executables( "cc.set_executables(
compiler='gcc', compiler='gcc',
compiler_so='gcc', compiler_so='gcc',
linker_exe='gcc', linker_exe='gcc',
linker_so='gcc -shared'); defines"))))) linker_so='gcc -shared'); defines"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 ; only Python 2 is supported `(#:python ,python-2 ; only Python 2 is supported
@ -4777,7 +4789,8 @@ (define-public rseqc
(("^from distribute_setup import use_setuptools") "") (("^from distribute_setup import use_setuptools") "")
(("^use_setuptools\\(\\)") "") (("^use_setuptools\\(\\)") "")
;; do not use bundled copy of pysam ;; do not use bundled copy of pysam
(("^have_pysam = False") "have_pysam = True")))))) (("^have_pysam = False") "have_pysam = True"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments `(#:python ,python-2)) (arguments `(#:python ,python-2))
(inputs (inputs
@ -5333,9 +5346,10 @@ (define-public preseq
(sha256 (sha256
(base32 "08r684l50pnxjpvmhzjgqq56yv9rfw90k8vx0nsrnrzk8mf9hsdq")) (base32 "08r684l50pnxjpvmhzjgqq56yv9rfw90k8vx0nsrnrzk8mf9hsdq"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Remove bundled samtools. ;; Remove bundled samtools.
'(delete-file-recursively "samtools")))) (delete-file-recursively "samtools")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;no "check" target `(#:tests? #f ;no "check" target
@ -11807,7 +11821,8 @@ (define-public sailfish
(snippet (snippet
'(begin (delete-file-recursively "include/spdlog") '(begin (delete-file-recursively "include/spdlog")
(for-each delete-file '("include/xxhash.h" (for-each delete-file '("include/xxhash.h"
"src/xxhash.c")))))) "src/xxhash.c"))
#t))))
("libdivsufsort" ,libdivsufsort) ("libdivsufsort" ,libdivsufsort)
("libgff" ,libgff) ("libgff" ,libgff)
("tbb" ,tbb) ("tbb" ,tbb)
@ -12532,7 +12547,8 @@ (define-public dropseq-tools
(snippet (snippet
'(begin '(begin
(for-each delete-file (find-files "jar/lib" "\\.jar$")) (for-each delete-file (find-files "jar/lib" "\\.jar$"))
(delete-file-recursively "3rdParty"))))) (delete-file-recursively "3rdParty")
#t))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:tests? #f ; test data are not included `(#:tests? #f ; test data are not included

28
gnu/packages/cdrom.scm
View file

@ -188,9 +188,11 @@ (define-public cdparanoia
(patches (search-patches "cdparanoia-fpic.patch")) (patches (search-patches "cdparanoia-fpic.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make libraries respect LDFLAGS. '(begin
'(substitute* '("paranoia/Makefile.in" "interface/Makefile.in") ;; Make libraries respect LDFLAGS.
(("-Wl,-soname") "$(LDFLAGS) -Wl,-soname"))))) (substitute* '("paranoia/Makefile.in" "interface/Makefile.in")
(("-Wl,-soname") "$(LDFLAGS) -Wl,-soname"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there is no check target `(#:tests? #f ; there is no check target
@ -449,9 +451,11 @@ (define-public cd-discid
"0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz")) "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(begin
(("/usr/bin/install") (substitute* "Makefile"
"install"))))) (("/usr/bin/install")
"install"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
@ -479,11 +483,13 @@ (define-public abcde
"0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774")) "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(begin
(("/usr/bin/install") (substitute* "Makefile"
"install") (("/usr/bin/install")
(("^etcdir = .*$") "install")
(string-append "etcdir = $(prefix)/etc\n")))))) (("^etcdir = .*$")
(string-append "etcdir = $(prefix)/etc\n")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

6
gnu/packages/chez.scm
View file

@ -74,8 +74,10 @@ (define-public chez-scheme
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Fix compilation with glibc >= 2.26, which removed xlocale.h. ;; Fix compilation with glibc >= 2.26, which removed xlocale.h.
'(substitute* "c/expeditor.c" '(begin
(("xlocale\\.h") "locale.h"))))) (substitute* "c/expeditor.c"
(("xlocale\\.h") "locale.h"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)

3
gnu/packages/code.scm
View file

@ -414,7 +414,8 @@ (define-public rtags
(let ((files (find-files "." ".*\\.cpp|.*\\.h"))) (let ((files (find-files "." ".*\\.cpp|.*\\.h")))
(substitute* files (substitute* files
(("#include ?\"rct/(.*.h)\"" all header) (("#include ?\"rct/(.*.h)\"" all header)
(string-append "#include <rct/" header ">")))))) (string-append "#include <rct/" header ">")))
#t)))
(sha256 (sha256
(base32 (base32
"0scjbp1z201q8njvrxqz7lk2m9b6k2rxd5q1shrng6532r7ndif2")))) "0scjbp1z201q8njvrxqz7lk2m9b6k2rxd5q1shrng6532r7ndif2"))))

21
gnu/packages/compression.scm
View file

@ -920,10 +920,11 @@ (define-public brotli
(base32 (base32
"1qxxsasvwbbbh6dl3138y9h3fg0q2v7xdk5jjc690bdg7g1wrj6n")) "1qxxsasvwbbbh6dl3138y9h3fg0q2v7xdk5jjc690bdg7g1wrj6n"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; This is a recursive submodule that is unnecessary for this ;; This is a recursive submodule that is
;; package, so delete it. ;; unnecessary for this package, so delete it.
'(delete-file-recursively "brotli/terryfy")))) (delete-file-recursively "brotli/terryfy")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -982,7 +983,9 @@ (define-public xdelta
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(snippet (snippet
;; This file isn't freely distributable and has no effect on building. ;; This file isn't freely distributable and has no effect on building.
'(delete-file "xdelta3/draft-korn-vcdiff.txt")))) '(begin
(delete-file "xdelta3/draft-korn-vcdiff.txt")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -1450,7 +1453,9 @@ (define-public gzstream
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove pre-compiled object. ;; Remove pre-compiled object.
'(delete-file "gzstream.o")))) '(begin
(delete-file "gzstream.o")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -1487,7 +1492,9 @@ (define-public zpaq
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete irrelevant pre-compiled binaries. ;; Delete irrelevant pre-compiled binaries.
'(for-each delete-file (find-files "." "\\.exe$"))))) '(begin
(for-each delete-file (find-files "." "\\.exe$"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

6
gnu/packages/cross-base.scm
View file

@ -182,8 +182,10 @@ (define (cross-gcc-patches target)
(define (cross-gcc-snippet target) (define (cross-gcc-snippet target)
"Return GCC snippet needed for TARGET." "Return GCC snippet needed for TARGET."
(cond ((target-mingw? target) (cond ((target-mingw? target)
'(copy-recursively "libstdc++-v3/config/os/mingw32-w64" '(begin
"libstdc++-v3/config/os/newlib")) (copy-recursively "libstdc++-v3/config/os/mingw32-w64"
"libstdc++-v3/config/os/newlib")
#t))
(else #f))) (else #f)))
(define* (cross-gcc target (define* (cross-gcc target

17
gnu/packages/crypto.scm
View file

@ -181,7 +181,8 @@ (define-public opendht
(substitute* "src/crypto.cpp" (substitute* "src/crypto.cpp"
(("argon2/argon2.h") "argon2.h")) (("argon2/argon2.h") "argon2.h"))
(substitute* "configure.ac" (substitute* "configure.ac"
(("src/argon2/Makefile") "")))) (("src/argon2/Makefile") ""))
#t))
(sha256 (sha256
(base32 (base32
"09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x")))) "09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x"))))
@ -226,9 +227,11 @@ (define-public encfs
"1906254dg5hwljh0h4gyrw09ms3b57dlhjfzhfzffv50yzpkl837")) "1906254dg5hwljh0h4gyrw09ms3b57dlhjfzhfzffv50yzpkl837"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove bundled dependencies in favour of proper inputs. ;; Remove bundled dependencies in favour of proper inputs.
(snippet '(for-each delete-file-recursively (snippet '(begin
(find-files "internal" "^tinyxml2-[0-9]" (for-each delete-file-recursively
#:directories? #t))))) (find-files "internal" "^tinyxml2-[0-9]"
#:directories? #t))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -270,8 +273,10 @@ (define-public keyutils
"1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i")) "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Create relative symbolic links instead of absolute ones to /lib/* ;; Create relative symbolic links instead of absolute ones to /lib/*
(snippet '(substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/") (snippet '(begin
"$(LNS) "))))) (substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/")
"$(LNS) "))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

9
gnu/packages/cups.scm
View file

@ -79,7 +79,8 @@ (define-public cups-filters
;; output directory, not CUPS's prefix. ;; output directory, not CUPS's prefix.
(substitute* "configure" (substitute* "configure"
(("\\{CUPS_DATADIR\\}/data") (("\\{CUPS_DATADIR\\}/data")
"{prefix}/share/cups/data")))))) "{prefix}/share/cups/data"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" %output)) `(#:make-flags (list (string-append "PREFIX=" %output))
@ -381,8 +382,10 @@ (define-public hplip
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Fix type mismatch. ;; Fix type mismatch.
'(substitute* "prnt/hpcups/genPCLm.cpp" '(begin
(("boolean") "bool"))))) (substitute* "prnt/hpcups/genPCLm.cpp"
(("boolean") "bool"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://hplipopensource.com/") (home-page "http://hplipopensource.com/")
(synopsis "HP Printer Drivers") (synopsis "HP Printer Drivers")

13
gnu/packages/databases.scm
View file

@ -435,7 +435,8 @@ (define-public mongodb
(string-append "src/third_party/" dir))) (string-append "src/third_party/" dir)))
'("pcre-8.41" "scons-2.5.0" "snappy-1.1.3" '("pcre-8.41" "scons-2.5.0" "snappy-1.1.3"
"valgrind-3.11.0" "wiredtiger" "valgrind-3.11.0" "wiredtiger"
"yaml-cpp-0.5.3" "zlib-1.2.8")))) "yaml-cpp-0.5.3" "zlib-1.2.8"))
#t))
(patches (patches
(list (list
(search-patch "mongodb-support-unknown-linux-distributions.patch"))))) (search-patch "mongodb-support-unknown-linux-distributions.patch")))))
@ -1932,10 +1933,12 @@ (define-public python-lmdb
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled lmdb source files. ;; Delete bundled lmdb source files.
'(for-each delete-file (list "lib/lmdb.h" '(begin
"lib/mdb.c" (for-each delete-file (list "lib/lmdb.h"
"lib/midl.c" "lib/mdb.c"
"lib/midl.h"))))) "lib/midl.c"
"lib/midl.h"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("lmdb" ,lmdb))) `(("lmdb" ,lmdb)))

4
gnu/packages/dns.scm
View file

@ -176,7 +176,9 @@ (define-public dnscrypt-proxy
(snippet (snippet
;; Delete bundled libltdl. XXX: This package also bundles ;; Delete bundled libltdl. XXX: This package also bundles
;; a modified libevent that cannot currently be removed. ;; a modified libevent that cannot currently be removed.
'(delete-file-recursively "libltdl")))) '(begin
(delete-file-recursively "libltdl")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

52
gnu/packages/emacs.scm
View file

@ -148,7 +148,8 @@ (define-public emacs
(list line (list line
"\"~/.guix-profile/include\"" "\"~/.guix-profile/include\""
"\"/var/guix/profiles/system/profile/include\"") "\"/var/guix/profiles/system/profile/include\"")
" "))))))) " ")))
#t))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -837,21 +838,23 @@ (define-public emms
"1b0kalhn81dir26jgsma30i5bbly7d3s1ngqpf01zjjpr7lw5v0h")) "1b0kalhn81dir26jgsma30i5bbly7d3s1ngqpf01zjjpr7lw5v0h"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(begin
(("/usr/bin/install-info") (substitute* "Makefile"
;; No need to use 'install-info' since it would create a (("/usr/bin/install-info")
;; useless 'dir' file. ;; No need to use 'install-info' since it would create a
"true") ;; useless 'dir' file.
(("^INFODIR=.*") "true")
;; Install Info files to $out/share/info, not $out/info. (("^INFODIR=.*")
"INFODIR := $(PREFIX)/share/info\n") ;; Install Info files to $out/share/info, not $out/info.
(("/site-lisp/emms") "INFODIR := $(PREFIX)/share/info\n")
;; Install directly in share/emacs/site-lisp, not in a (("/site-lisp/emms")
;; sub-directory. ;; Install directly in share/emacs/site-lisp, not in a
"/site-lisp") ;; sub-directory.
(("^all: (.*)\n" _ rest) "/site-lisp")
;; Build 'emms-print-metadata'. (("^all: (.*)\n" _ rest)
(string-append "all: " rest " emms-print-metadata\n")))))) ;; Build 'emms-print-metadata'.
(string-append "all: " rest " emms-print-metadata\n")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -1011,9 +1014,11 @@ (define-public bbdb
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; We don't want to build and install the PDF. ;; We don't want to build and install the PDF.
'(substitute* "doc/Makefile.in" '(begin
(("^doc_DATA = .*$") (substitute* "doc/Makefile.in"
"doc_DATA =\n"))))) (("^doc_DATA = .*$")
"doc_DATA =\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -2614,7 +2619,8 @@ (define-public emacs-mit-scheme-doc
'(begin '(begin
(for-each delete-file '("dot-emacs.el" "Makefile")) (for-each delete-file '("dot-emacs.el" "Makefile"))
(install-file "6.945-config/mit-scheme-doc.el" ".") (install-file "6.945-config/mit-scheme-doc.el" ".")
(delete-file-recursively "6.945-config"))) (delete-file-recursively "6.945-config")
#t))
(file-name (string-append name "-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.bz2"))
(method url-fetch) (method url-fetch)
(uri (string-append "http://groups.csail.mit.edu/mac/users/gjs/" (uri (string-append "http://groups.csail.mit.edu/mac/users/gjs/"
@ -3739,7 +3745,8 @@ (define-public emacs-ess
(substitute* "lisp/Makefile" (substitute* "lisp/Makefile"
(("^\tjulia-mode.elc\\\\\n") "") (("^\tjulia-mode.elc\\\\\n") "")
(("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el") (("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el")
"all: $(ELC) ess-custom.el")))))) "all: $(ELC) ess-custom.el"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(let ((base-directory "/share/emacs/site-lisp/guix.d/ess")) (let ((base-directory "/share/emacs/site-lisp/guix.d/ess"))
@ -4985,7 +4992,8 @@ (define-public emacs-yasnippet
;; warnings about a missing directory. ;; warnings about a missing directory.
(substitute* "yasnippet.el" (substitute* "yasnippet.el"
(("^ +'yas-installed-snippets-dir\\)\\)\n") (("^ +'yas-installed-snippets-dir\\)\\)\n")
"))\n")))))) "))\n"))
#t))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/joaotavora/yasnippet") (home-page "https://github.com/joaotavora/yasnippet")
(synopsis "Yet another snippet extension for Emacs") (synopsis "Yet another snippet extension for Emacs")

15
gnu/packages/emulators.scm
View file

@ -410,11 +410,13 @@ (define-public mgba
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure we don't use the bundled software. ;; Make sure we don't use the bundled software.
'(for-each '(begin
(lambda (subdir) (for-each
(let ((lib-subdir (string-append "src/third-party/" subdir))) (lambda (subdir)
(delete-file-recursively lib-subdir))) (let ((lib-subdir (string-append "src/third-party/" subdir)))
'("libpng" "lzma" "sqlite3" "zlib"))))) (delete-file-recursively lib-subdir)))
'("libpng" "lzma" "sqlite3" "zlib"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no "test" target `(#:tests? #f ;no "test" target
@ -1010,7 +1012,8 @@ (define-public nestopia-ue
;; Use system zlib. ;; Use system zlib.
(delete-file-recursively "source/zlib") (delete-file-recursively "source/zlib")
(substitute* "source/core/NstZlib.cpp" (substitute* "source/core/NstZlib.cpp"
(("#include \"../zlib/zlib.h\"") "#include <zlib.h>")))))) (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

13
gnu/packages/engineering.scm
View file

@ -329,7 +329,9 @@ (define-public fastcap
"0x37vfp6k0d2z3gnig0hbicvi0jp8v267xjnn3z8jdllpiaa6p3k")) "0x37vfp6k0d2z3gnig0hbicvi0jp8v267xjnn3z8jdllpiaa6p3k"))
(snippet (snippet
;; Remove a non-free file. ;; Remove a non-free file.
'(delete-file "doc/psfig.sty")) '(begin
(delete-file "doc/psfig.sty")
#t))
(patches (search-patches "fastcap-mulSetup.patch" (patches (search-patches "fastcap-mulSetup.patch"
"fastcap-mulGlobal.patch")))) "fastcap-mulGlobal.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -592,7 +594,8 @@ (define-public ao
;; Use #include <catch.hpp>. ;; Use #include <catch.hpp>.
(substitute* (find-files "." "\\.[ch]pp$") (substitute* (find-files "." "\\.[ch]pp$")
(("catch/catch\\.hpp") (("catch/catch\\.hpp")
"catch.hpp")))))) "catch.hpp"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(;; Have the RUNPATH of libao.so point to $libdir, where libefsw.so `(;; Have the RUNPATH of libao.so point to $libdir, where libefsw.so
@ -1152,7 +1155,8 @@ (define-public radare2
(substitute* "libr/parse/p/Makefile" (substitute* "libr/parse/p/Makefile"
(("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) "))
(substitute* "libr/bin/p/Makefile" (substitute* "libr/bin/p/Makefile"
(("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")))))) (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) "))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f; tests require git and network access '(#:tests? #f; tests require git and network access
@ -1257,7 +1261,8 @@ (define-public libngspice
(("src/ciderlib/input/Makefile") "") (("src/ciderlib/input/Makefile") "")
(("src/ciderlib/support/Makefile") "") (("src/ciderlib/support/Makefile") "")
(("src/ciderlib/oned/Makefile") "") (("src/ciderlib/oned/Makefile") "")
(("src/ciderlib/twod/Makefile") "")))))) (("src/ciderlib/twod/Makefile") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; No tests for libngspice exist. `(;; No tests for libngspice exist.

3
gnu/packages/enlightenment.scm
View file

@ -202,7 +202,8 @@ (define-public terminology
"data/themes/Makefile.am" "data/themes/Makefile.am"
"data/themes/nyanology/Makefile.in" "data/themes/nyanology/Makefile.in"
"data/themes/nyanology/Makefile.am") "data/themes/nyanology/Makefile.am")
(("-fd \\$\\(top_srcdir\\)/data/fonts") "")))))) (("-fd \\$\\(top_srcdir\\)/data/fonts") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

6
gnu/packages/fpga.scm
View file

@ -131,8 +131,10 @@ (define-public yosys
(file-name (string-append name "-" version "-checkout.tar.gz")) (file-name (string-append name "-" version "-checkout.tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(begin
(("ABCREV = .*") "ABCREV = default\n"))))) (substitute* "Makefile"
(("ABCREV = .*") "ABCREV = default\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"

3
gnu/packages/freedesktop.scm
View file

@ -233,7 +233,8 @@ (define-public elogind
(substitute* "Makefile.am" (substitute* "Makefile.am"
;; Avoid validation against DTD because the DTDs for ;; Avoid validation against DTD because the DTDs for
;; both doctype 4.2 and 4.5 are needed. ;; both doctype 4.2 and 4.5 are needed.
(("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")))))) (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;FIXME: "make check" in the "po" directory fails. `(#:tests? #f ;FIXME: "make check" in the "po" directory fails.

3
gnu/packages/ftp.scm
View file

@ -112,7 +112,8 @@ (define-public ncftp
;; This is free software, avoid any confusion. ;; This is free software, avoid any confusion.
(substitute* (find-files "." "\\.c$") (substitute* (find-files "." "\\.c$")
(("a freeware program") (("a freeware program")
"free software")))))) "free software"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

83
gnu/packages/games.scm
View file

@ -188,11 +188,13 @@ (define-public cataclysm-dda
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Import cmath header for the std::pow function. ;; Import cmath header for the std::pow function.
'(for-each (lambda (file) '(begin
(substitute* file (for-each (lambda (file)
(("#include <math.h>") (substitute* file
"#include <cmath>"))) (("#include <math.h>")
(find-files "src"))))) "#include <cmath>")))
(find-files "src"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
@ -682,9 +684,11 @@ (define-public prboom-plus
"151v6nign86m1a2vqz27krsccpc9m4d1jax4y43v2fa82wfj9qp0")) "151v6nign86m1a2vqz27krsccpc9m4d1jax4y43v2fa82wfj9qp0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "src/version.c" '(begin
(("__DATE__") "") (substitute* "src/version.c"
(("__TIME__") ""))))) (("__DATE__") "")
(("__TIME__") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-cpu-opt") '(#:configure-flags '("--disable-cpu-opt")
@ -896,7 +900,9 @@ (define-public abbaye
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Unbundle fonts. ;; Unbundle fonts.
'(delete-file-recursively "fonts")))) '(begin
(delete-file-recursively "fonts")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags '("CC=gcc") '(#:make-flags '("CC=gcc")
@ -952,15 +958,15 @@ (define-public angband
;; In the future, if someone tries to make a graphical variant of ;; In the future, if someone tries to make a graphical variant of
;; this package, they can deal with that mess themselves. :) ;; this package, they can deal with that mess themselves. :)
'(begin '(begin
(for-each (for-each (lambda (subdir)
(lambda (subdir) (let ((lib-subdir (string-append "lib/" subdir)))
(let ((lib-subdir (string-append "lib/" subdir))) (delete-file-recursively lib-subdir)))
(delete-file-recursively lib-subdir))) '("fonts" "icons" "sounds" "tiles"))
'("fonts" "icons" "sounds" "tiles"))
(substitute* "lib/Makefile" (substitute* "lib/Makefile"
;; And don't try to invoke makefiles in the directories we removed ;; And don't try to invoke makefiles in the directories we removed
(("gamedata customize help screens fonts tiles sounds icons user") (("gamedata customize help screens fonts tiles sounds icons user")
"gamedata customize help screens user")))))) "gamedata customize help screens user"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;no check target `(#:tests? #f ;no check target
@ -1281,11 +1287,13 @@ (define-public gtypist
;; We do not provide `ncurses.h' within an `ncursesw' ;; We do not provide `ncurses.h' within an `ncursesw'
;; sub-directory, so patch the source accordingly. See ;; sub-directory, so patch the source accordingly. See
;; <http://bugs.gnu.org/19018>. ;; <http://bugs.gnu.org/19018>.
'(for-each (lambda (file) '(begin
(substitute* file (for-each (lambda (file)
(("ncursesw/ncurses.h") (substitute* file
"ncurses.h"))) (("ncursesw/ncurses.h")
(find-files "." "configure$|\\.c$"))))) "ncurses.h")))
(find-files "." "configure$|\\.c$"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("perl" ,perl))) ("perl" ,perl)))
@ -1989,7 +1997,9 @@ (define openttd-engine
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; The DOS port contains proprietary software. ;; The DOS port contains proprietary software.
'(delete-file-recursively "os/dos")))) '(begin
(delete-file-recursively "os/dos")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
@ -2839,7 +2849,8 @@ (define-public tuxpaint
(substitute* "Makefile" (substitute* "Makefile"
;; Do not rely on $(GPERF) being an absolute file name ;; Do not rely on $(GPERF) being an absolute file name
(("\\[ -x \\$\\(GPERF\\) \\]") (("\\[ -x \\$\\(GPERF\\) \\]")
"$(GPERF) --version >/dev/null 2>&1")))) "$(GPERF) --version >/dev/null 2>&1"))
#t))
(patches (search-patches "tuxpaint-stamps-path.patch")))) (patches (search-patches "tuxpaint-stamps-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -4050,14 +4061,13 @@ (define-public 0ad-data
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
(for-each (for-each (lambda (name)
(lambda (name) (let* ((dir (string-append "binaries/data/mods/" name))
(let* ((dir (string-append "binaries/data/mods/" name)) (file (string-append dir "/" name ".zip"))
(file (string-append dir "/" name ".zip")) (unzip #$(file-append unzip "/bin/unzip")))
(unzip #$(file-append unzip "/bin/unzip"))) (system* unzip "-d" dir file)
(system* unzip "-d" dir file) (delete-file file)))
(delete-file file))) '("mod" "public"))
'("mod" "public"))
#t)))) #t))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs `(("tar" ,tar) (native-inputs `(("tar" ,tar)
@ -4292,10 +4302,12 @@ (define-public tome4
"0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03")) "0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/music.h" "src/tSDL.h") '(begin
(("#elif defined(__FreeBSD__)" line) (substitute* '("src/music.h" "src/tSDL.h")
(string-append (("#elif defined(__FreeBSD__)" line)
line " || defined(__GNUC__)")))))) (string-append
line " || defined(__GNUC__)")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
@ -4777,7 +4789,8 @@ (define-public gzdoom
(delete-file-recursively "bzip2") (delete-file-recursively "bzip2")
(delete-file-recursively "game-music-emu") (delete-file-recursively "game-music-emu")
(delete-file-recursively "jpeg-6b") (delete-file-recursively "jpeg-6b")
(delete-file-recursively "zlib"))))) (delete-file-recursively "zlib")
#t))))
(arguments (arguments
'(#:tests? #f '(#:tests? #f
#:configure-flags #:configure-flags

56
gnu/packages/gcc.scm
View file

@ -370,13 +370,15 @@ (define-public gcc-4.8
;; This is required for building with glibc-2.26. ;; This is required for building with glibc-2.26.
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
(snippet (snippet
'(for-each '(begin
(lambda (dir) (for-each
(substitute* (string-append "libgcc/config/" (lambda (dir)
dir "/linux-unwind.h") (substitute* (string-append "libgcc/config/"
(("struct ucontext") "ucontext_t"))) dir "/linux-unwind.h")
'("aarch64" "alpha" "bfin" "i386" "m68k" (("struct ucontext") "ucontext_t")))
"pa" "sh" "tilepro" "xtensa"))))) '("aarch64" "alpha" "bfin" "i386" "m68k"
"pa" "sh" "tilepro" "xtensa"))
#t))))
(supported-systems %supported-systems) (supported-systems %supported-systems)
(inputs (inputs
`(("isl" ,isl-0.11) `(("isl" ,isl-0.11)
@ -402,13 +404,15 @@ (define-public gcc-4.9
;; This is required for building with glibc-2.26. ;; This is required for building with glibc-2.26.
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
(snippet (snippet
'(for-each '(begin
(lambda (dir) (for-each
(substitute* (string-append "libgcc/config/" (lambda (dir)
dir "/linux-unwind.h") (substitute* (string-append "libgcc/config/"
(("struct ucontext") "ucontext_t"))) dir "/linux-unwind.h")
'("aarch64" "alpha" "bfin" "i386" "m68k" "nios2" (("struct ucontext") "ucontext_t")))
"pa" "sh" "tilepro" "xtensa"))))) '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
"pa" "sh" "tilepro" "xtensa"))
#t))))
;; Override inherited texinfo-5 with latest version. ;; Override inherited texinfo-5 with latest version.
(native-inputs `(("perl" ,perl) ;for manpages (native-inputs `(("perl" ,perl) ;for manpages
("texinfo" ,texinfo))))) ("texinfo" ,texinfo)))))
@ -440,9 +444,11 @@ (define-public gcc-5
;; ;;
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67590 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67590
;; http://cgit.openembedded.org/openembedded-core/commit/?id=f6e47aa9b12f9ab61530c40e0343f451699d9077 ;; http://cgit.openembedded.org/openembedded-core/commit/?id=f6e47aa9b12f9ab61530c40e0343f451699d9077
'(substitute* "libcc1/configure" '(begin
(("\\$gcc_cv_objdump -T") (substitute* "libcc1/configure"
"$OBJDUMP_FOR_TARGET -T"))))) (("\\$gcc_cv_objdump -T")
"$OBJDUMP_FOR_TARGET -T"))
#t))))
(inputs (inputs
`(("isl" ,isl) `(("isl" ,isl)
,@(package-inputs gcc-4.7))))) ,@(package-inputs gcc-4.7)))))
@ -468,13 +474,15 @@ (define-public gcc-6
;; This can be removed when gcc-6.5.0 is released. ;; This can be removed when gcc-6.5.0 is released.
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
(snippet (snippet
'(for-each '(begin
(lambda (dir) (for-each
(substitute* (string-append "libgcc/config/" (lambda (dir)
dir "/linux-unwind.h") (substitute* (string-append "libgcc/config/"
(("struct ucontext") "ucontext_t"))) dir "/linux-unwind.h")
'("aarch64" "alpha" "bfin" "i386" "m68k" "nios2" (("struct ucontext") "ucontext_t")))
"pa" "sh" "tilepro" "xtensa"))))) '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
"pa" "sh" "tilepro" "xtensa"))
#t))))
(inputs (inputs
`(("isl" ,isl) `(("isl" ,isl)
,@(package-inputs gcc-4.7))))) ,@(package-inputs gcc-4.7)))))

3
gnu/packages/geo.scm
View file

@ -207,7 +207,8 @@ (define-public libgeotiff
(("^all-am: .*$") (("^all-am: .*$")
"all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h\n") "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h\n")
(("^install-data-am: .*$") (("^install-data-am: .*$")
"install-data-am: install-includeHEADERS")))))) "install-data-am: install-includeHEADERS"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libjpeg-turbo" ,libjpeg-turbo) `(("libjpeg-turbo" ,libjpeg-turbo)

3
gnu/packages/ghostscript.scm
View file

@ -155,7 +155,8 @@ (define-public ghostscript
'(begin '(begin
(for-each delete-file-recursively '("freetype" "jbig2dec" "jpeg" (for-each delete-file-recursively '("freetype" "jbig2dec" "jpeg"
"lcms2" "libpng" "lcms2" "libpng"
"tiff" "zlib")))))) "tiff" "zlib"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) ;19 MiB of HTML/PS doc + examples (outputs '("out" "doc")) ;19 MiB of HTML/PS doc + examples
(arguments (arguments

8
gnu/packages/gl.scm
View file

@ -478,9 +478,11 @@ (define-public glew
"0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5")) "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "config/Makefile.linux" '(begin
(("= cc") "= gcc") (substitute* "config/Makefile.linux"
(("/lib64") "/lib"))))) (("= cc") "= gcc")
(("/lib64") "/lib"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases (delete 'configure)) '(#:phases (modify-phases %standard-phases (delete 'configure))

6
gnu/packages/glib.scm
View file

@ -306,8 +306,10 @@ (define gobject-introspection
(base32 "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d")) (base32 "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "tools/g-ir-tool-template.in" '(begin
(("#!/usr/bin/env @PYTHON@") "#!@PYTHON@"))) (substitute* "tools/g-ir-tool-template.in"
(("#!/usr/bin/env @PYTHON@") "#!@PYTHON@"))
#t))
(patches (search-patches (patches (search-patches
"gobject-introspection-cc.patch" "gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch" "gobject-introspection-girepository.patch"

3
gnu/packages/gnome.scm
View file

@ -5021,7 +5021,8 @@ (define-public network-manager
(substitute* "src/nm-session-monitor.c" (substitute* "src/nm-session-monitor.c"
(("systemd") "elogind")) (("systemd") "elogind"))
(substitute* "./src/nm-logging.c" (substitute* "./src/nm-logging.c"
(("systemd") "elogind")))))) (("systemd") "elogind"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML "doc")) ; 8 MiB of gtk-doc HTML

12
gnu/packages/gnuzilla.scm
View file

@ -77,8 +77,10 @@ (define-public mozjs
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Fix incompatibility with Perl 5.22+. ;; Fix incompatibility with Perl 5.22+.
'(substitute* '("js/src/config/milestone.pl") '(begin
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (substitute* '("js/src/config/milestone.pl")
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
@ -136,8 +138,10 @@ (define-public mozjs-24
(patches (search-patches "mozjs24-aarch64-support.patch")) (patches (search-patches "mozjs24-aarch64-support.patch"))
(snippet (snippet
;; Fix incompatibility with Perl 5.22+. ;; Fix incompatibility with Perl 5.22+.
'(substitute* '("js/src/config/milestone.pl") '(begin
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (substitute* '("js/src/config/milestone.pl")
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments mozjs) (substitute-keyword-arguments (package-arguments mozjs)
((#:phases phases) ((#:phases phases)

3
gnu/packages/graphics.scm
View file

@ -339,7 +339,8 @@ (define-public openexr
;; and <https://github.com/openexr/openexr/pull/184>. ;; and <https://github.com/openexr/openexr/pull/184>.
(substitute* "IlmImf/Makefile.in" (substitute* "IlmImf/Makefile.in"
(("ImfIO\\.h") (("ImfIO\\.h")
"ImfIO.h ImfStdIO.h")))) "ImfIO.h ImfStdIO.h"))
#t))
(patches (search-patches "openexr-missing-samples.patch")))) (patches (search-patches "openexr-missing-samples.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

16
gnu/packages/gtk.scm
View file

@ -846,9 +846,11 @@ (define-public guile-rsvg
(patches (search-patches "guile-rsvg-pkgconfig.patch")) (patches (search-patches "guile-rsvg-pkgconfig.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* (find-files "." "Makefile\\.am") '(begin
(("/share/guile/site") (substitute* (find-files "." "Makefile\\.am")
"/share/guile/site/@GUILE_EFFECTIVE_VERSION@"))) (("/share/guile/site")
"/share/guile/site/@GUILE_EFFECTIVE_VERSION@"))
#t))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
@ -881,9 +883,11 @@ (define-public guile-present
(patches (search-patches "guile-present-coding.patch")) (patches (search-patches "guile-present-coding.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile.in" '(begin
(("godir = .*$") (substitute* "Makefile.in"
"godir = $(moddir)\n"))))) (("godir = .*$")
"godir = $(moddir)\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

31
gnu/packages/guile.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co> ;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -240,8 +240,10 @@ (define-public guile-2.2
;; Remove the pre-built object files. Instead, build everything ;; Remove the pre-built object files. Instead, build everything
;; from source, at the expense of significantly longer build ;; from source, at the expense of significantly longer build
;; times (almost 3 hours on a 4-core Intel i5). ;; times (almost 3 hours on a 4-core Intel i5).
(snippet '(for-each delete-file (snippet '(begin
(find-files "prebuilt" "\\.go$"))))) (for-each delete-file
(find-files "prebuilt" "\\.go$"))
#t))))
(properties '((timeout . 72000) ;20 hours (properties '((timeout . 72000) ;20 hours
(max-silent-time . 36000))) ;10 hours (needed on ARM (max-silent-time . 36000))) ;10 hours (needed on ARM
; when heavily loaded) ; when heavily loaded)
@ -525,7 +527,8 @@ (define-public artanis
post))) post)))
(substitute* "artanis/artanis.scm" (substitute* "artanis/artanis.scm"
(("[[:punct:][:space:]]+->json-string[[:punct:][:space:]]+") (("[[:punct:][:space:]]+->json-string[[:punct:][:space:]]+")
"")))))) ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; TODO: Add guile-dbi and guile-dbd optional dependencies. ;; TODO: Add guile-dbi and guile-dbd optional dependencies.
(inputs `(("guile" ,guile-2.2) (inputs `(("guile" ,guile-2.2)
@ -852,7 +855,8 @@ (define-public guile-json
"ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
(substitute* '("Makefile.in" "json/Makefile.in") (substitute* '("Makefile.in" "json/Makefile.in")
(("moddir =.*/share/guile/site" all) (("moddir =.*/share/guile/site" all)
(string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("guile" ,guile-2.2))) (native-inputs `(("guile" ,guile-2.2)))
(home-page "https://savannah.nongnu.org/projects/guile-json/") (home-page "https://savannah.nongnu.org/projects/guile-json/")
@ -1225,9 +1229,11 @@ (define-public guile-sqlite3
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Upgrade 'Makefile.am' to the current way of doing things. ;; Upgrade 'Makefile.am' to the current way of doing things.
'(substitute* "Makefile.am" '(begin
(("TESTS_ENVIRONMENT") (substitute* "Makefile.am"
"TEST_LOG_COMPILER"))))) (("TESTS_ENVIRONMENT")
"TEST_LOG_COMPILER"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -1362,7 +1368,8 @@ (define-public guile-redis
"redis/Makefile.in" "redis/Makefile.in"
"redis/commands/Makefile.in") "redis/commands/Makefile.in")
(("moddir =.*/share/guile/site" all) (("moddir =.*/share/guile/site" all)
(string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("guile" ,guile-2.0))) `(("guile" ,guile-2.0)))
@ -1475,7 +1482,8 @@ (define-public guile-sly
(("godir = .*$") (("godir = .*$")
(string-append (string-append
"godir = " "godir = "
"$(prefix)/lib/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))))))) "$(prefix)/lib/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -1729,7 +1737,8 @@ (define-public guile-commonmark
"ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("/site/2.0") (("/site/2.0")
"/site/@GUILE_EFFECTIVE_VERSION@")))))) "/site/@GUILE_EFFECTIVE_VERSION@"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("guile" ,guile-2.2))) `(("guile" ,guile-2.2)))

3
gnu/packages/irc.scm
View file

@ -81,7 +81,8 @@ (define-public quassel
'(begin '(begin
(delete-file-recursively "data/scripts") (delete-file-recursively "data/scripts")
(substitute* "data/CMakeLists.txt" (substitute* "data/CMakeLists.txt"
(("NOT WIN32") "WIN32")))))) (("NOT WIN32") "WIN32"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; The three binaries are not mutually exlusive, and are all built ;; The three binaries are not mutually exlusive, and are all built

20
gnu/packages/java.scm
View file

@ -752,10 +752,12 @@ (define-public icedtea-6
"0bg9sb4f7qbq77c0zf9m17p47ga0kf0r9622g9p12ysg26jd1ksg")) "0bg9sb4f7qbq77c0zf9m17p47ga0kf0r9622g9p12ysg26jd1ksg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile.in" '(begin
;; do not leak information about the build host (substitute* "Makefile.in"
(("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"") ;; do not leak information about the build host
"DISTRIBUTION_ID=\"\\\"guix\\\"\""))))) (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
"DISTRIBUTION_ID=\"\\\"guix\\\"\""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; Java Runtime Environment (outputs '("out" ; Java Runtime Environment
"jdk" ; Java Development Kit "jdk" ; Java Development Kit
@ -1096,10 +1098,12 @@ (define-public icedtea-7
"0s0zh0mj1sab99kb516lsgq3859vsc951phc565gwix4l5g9zppk")) "0s0zh0mj1sab99kb516lsgq3859vsc951phc565gwix4l5g9zppk"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile.in" '(begin
;; do not leak information about the build host (substitute* "Makefile.in"
(("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"") ;; do not leak information about the build host
"DISTRIBUTION_ID=\"\\\"guix\\\"\""))))) (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
"DISTRIBUTION_ID=\"\\\"guix\\\"\""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; Java Runtime Environment (outputs '("out" ; Java Runtime Environment
"jdk" ; Java Development Kit "jdk" ; Java Development Kit

8
gnu/packages/kerberos.scm
View file

@ -147,9 +147,11 @@ (define-public heimdal
"heimdal-CVE-2017-11103.patch")) "heimdal-CVE-2017-11103.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "configure" '(begin
(("User=.*$") "User=Guix\n") (substitute* "configure"
(("Date=.*$") "Date=2017\n"))))) (("User=.*$") "User=Guix\n")
(("Date=.*$") "Date=2017\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list '(#:configure-flags (list

75
gnu/packages/linux.scm
View file

@ -1687,16 +1687,19 @@ (define fuse-static
(source (origin (inherit (package-source fuse)) (source (origin (inherit (package-source fuse))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Normally libfuse invokes mount(8) so that /etc/mtab is '(begin
;; updated. Change calls to 'mtab_needs_update' to 0 so that ;; Normally libfuse invokes mount(8) so that /etc/mtab is
;; it doesn't do that, allowing us to remove the dependency on ;; updated. Change calls to 'mtab_needs_update' to 0 so
;; util-linux (something that is useful in initrds.) ;; that it doesn't do that, allowing us to remove the
'(substitute* '("lib/mount_util.c" ;; dependency on util-linux (something that is useful in
"util/mount_util.c") ;; initrds.)
(("mtab_needs_update[[:blank:]]*\\([a-z_]+\\)") (substitute* '("lib/mount_util.c"
"0") "util/mount_util.c")
(("/bin/") (("mtab_needs_update[[:blank:]]*\\([a-z_]+\\)")
""))))))) "0")
(("/bin/")
""))
#t))))))
(define-public unionfs-fuse/static (define-public unionfs-fuse/static
(package (inherit unionfs-fuse) (package (inherit unionfs-fuse)
@ -1705,11 +1708,13 @@ (define-public unionfs-fuse/static
(source (origin (inherit (package-source unionfs-fuse)) (source (origin (inherit (package-source unionfs-fuse))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Add -ldl to the libraries, because libfuse.a needs that. '(begin
'(substitute* "src/CMakeLists.txt" ;; Add -ldl to the libraries, because libfuse.a needs that.
(("target_link_libraries(.*)\\)" _ libs) (substitute* "src/CMakeLists.txt"
(string-append "target_link_libraries" (("target_link_libraries(.*)\\)" _ libs)
libs " dl)")))))) (string-append "target_link_libraries"
libs " dl)")))
#t))))
(arguments (arguments
'(#:tests? #f '(#:tests? #f
#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static") #:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static")
@ -1871,7 +1876,8 @@ (define-public kbd
(substitute* '("src/unicode_start" "src/unicode_stop") (substitute* '("src/unicode_start" "src/unicode_stop")
;; Assume the Coreutils are in $PATH. ;; Assume the Coreutils are in $PATH.
(("/usr/bin/tty") (("/usr/bin/tty")
"tty")))))) "tty"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -2063,7 +2069,8 @@ (define-public lvm2
(("confdir = .*$") (("confdir = .*$")
"confdir = @sysconfdir@\n") "confdir = @sysconfdir@\n")
(("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@") (("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@")
"DEFAULT_SYS_DIR = @sysconfdir@")))) "DEFAULT_SYS_DIR = @sysconfdir@"))
#t))
(patches (search-patches "lvm2-static-link.patch")))) (patches (search-patches "lvm2-static-link.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -2247,7 +2254,9 @@ (define-public wireless-regdb
"1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip")) "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip"))
;; We're building 'regulatory.bin' by ourselves. ;; We're building 'regulatory.bin' by ourselves.
(snippet '(delete-file "regulatory.bin")))) (snippet '(begin
(delete-file "regulatory.bin")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -2680,7 +2689,8 @@ (define-public sysfsutils-1
"includedir = @includedir@")) "includedir = @includedir@"))
(substitute* "configure" (substitute* "configure"
(("includedir='(\\$\\{prefix\\}/include)'" all orig) (("includedir='(\\$\\{prefix\\}/include)'" all orig)
(string-append "includedir='" orig "/sysfs'"))))))) (string-append "includedir='" orig "/sysfs'")))
#t))))
(synopsis "System utilities based on Linux sysfs (version 1.x)"))) (synopsis "System utilities based on Linux sysfs (version 1.x)")))
(define-public cpufrequtils (define-public cpufrequtils
@ -3295,9 +3305,10 @@ (define-public thinkfan
(modules '((guix build utils))) (modules '((guix build utils)))
;; Fix erroneous man page location in Makefile leading to ;; Fix erroneous man page location in Makefile leading to
;; a compilation failure. ;; a compilation failure.
(snippet (snippet '(begin
'(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("thinkfan\\.1") "src/thinkfan.1"))))) (("thinkfan\\.1") "src/thinkfan.1"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:modules ((guix build cmake-build-system) `(#:modules ((guix build cmake-build-system)
@ -3348,11 +3359,12 @@ (define-public ntfs-3g
(base32 (base32
"1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy")) "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Install under $prefix. ;; Install under $prefix.
'(substitute* '("src/Makefile.in" "ntfsprogs/Makefile.in") (substitute* '("src/Makefile.in" "ntfsprogs/Makefile.in")
(("/sbin") (("/sbin")
"@sbindir@"))))) "@sbindir@"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux) (inputs `(("util-linux" ,util-linux)
("fuse" ,fuse))) ;libuuid ("fuse" ,fuse))) ;libuuid
@ -3648,9 +3660,12 @@ (define-public mcelog
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; The snapshots lack a .git directory, breaking ‘git describe’. `(begin
`(substitute* "Makefile" ;; The snapshots lack a .git directory,
(("\"unknown\"") (string-append "\"v" ,version "\"")))))) ;; breaking ‘git describe’.
(substitute* "Makefile"
(("\"unknown\"") (string-append "\"v" ,version "\"")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

36
gnu/packages/lisp.scm
View file

@ -189,8 +189,10 @@ (define-public ecl
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Add ecl-bundle-systems to 'default-system-source-registry'. ;; Add ecl-bundle-systems to 'default-system-source-registry'.
`(substitute* "contrib/asdf/asdf.lisp" `(begin
,@(asdf-substitutions name))))) (substitute* "contrib/asdf/asdf.lisp"
,@(asdf-substitutions name))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; src/configure uses 'which' to confirm the existence of 'gzip'. ;; src/configure uses 'which' to confirm the existence of 'gzip'.
(native-inputs `(("which" ,which))) (native-inputs `(("which" ,which)))
@ -324,8 +326,10 @@ (define-public sbcl
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Add sbcl-bundle-systems to 'default-system-source-registry'. ;; Add sbcl-bundle-systems to 'default-system-source-registry'.
`(substitute* "contrib/asdf/asdf.lisp" `(begin
,@(asdf-substitutions name))))) (substitute* "contrib/asdf/asdf.lisp"
,@(asdf-substitutions name))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
;; Bootstrap with CLISP. ;; Bootstrap with CLISP.
@ -618,10 +622,11 @@ (define-public lush2
(snippet (snippet
'(begin '(begin
(substitute* "src/unix.c" (substitute* "src/unix.c"
(("\\{ \"LUSH_DATE\", __DATE__ \\},") "") (("\\{ \"LUSH_DATE\", __DATE__ \\},") "")
(("\\{ \"LUSH_TIME\", __TIME__ \\},") "")) (("\\{ \"LUSH_TIME\", __TIME__ \\},") ""))
(substitute* "src/main.c" (substitute* "src/main.c"
(("\" \\(built \" __DATE__ \"\\)\"") "")))) (("\" \\(built \" __DATE__ \"\\)\"") ""))
#t))
(sha256 (sha256
(base32 (base32
"02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k")))) "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"))))
@ -920,7 +925,8 @@ (define-public sbcl-clx
(delete-file-recursively "demo") (delete-file-recursively "demo")
(delete-file "test/trapezoid.lisp") (delete-file "test/trapezoid.lisp")
(substitute* "clx.asd" (substitute* "clx.asd"
(("\\(:file \"trapezoid\"\\)") "")))))) (("\\(:file \"trapezoid\"\\)") ""))
#t))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(home-page "http://www.cliki.net/portable-clx") (home-page "http://www.cliki.net/portable-clx")
(synopsis "X11 client library for Common Lisp") (synopsis "X11 client library for Common Lisp")
@ -1048,12 +1054,12 @@ (define sbcl-slynk-boot0
(rename-file "contrib" "slynk/contrib") (rename-file "contrib" "slynk/contrib")
;; Move slynk's contents into the base directory for easier ;; Move slynk's contents into the base directory for easier
;; access ;; access
(for-each (for-each (lambda (file)
(lambda (file) (unless (string-prefix? "." file)
(unless (string-prefix? "." file) (rename-file (string-append "slynk/" file)
(rename-file (string-append "slynk/" file) (string-append "./" (basename file)))))
(string-append "./" (basename file))))) (scandir "slynk"))
(scandir "slynk")))))) #t))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(arguments (arguments
`(#:tests? #f ; No test suite `(#:tests? #f ; No test suite

3
gnu/packages/lxde.scm
View file

@ -364,7 +364,8 @@ (define-public lxsession
(and (string-suffix? ".c" file) (and (string-suffix? ".c" file)
(file-exists? (c->vala file)))))) (file-exists? (c->vala file))))))
(for-each delete-file (for-each delete-file
(find-files "." generated-c-file?)))))) (find-files "." generated-c-file?))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

3
gnu/packages/machine-learning.scm
View file

@ -408,7 +408,8 @@ (define (delete-ifdefs file)
(display line out)) (display line out))
(loop (read-line in 'concat) skip-next?))))))) (loop (read-line in 'concat) skip-next?)))))))
(for-each delete-ifdefs (find-files "src/shogun/kernel/" (for-each delete-ifdefs (find-files "src/shogun/kernel/"
"^Kernel\\.(cpp|h)")))))) "^Kernel\\.(cpp|h)"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ;no check target '(#:tests? #f ;no check target

8
gnu/packages/mail.scm
View file

@ -137,9 +137,11 @@ (define-public mailutils
(snippet (snippet
;; For a rebuild of the Flex/Bison byproducts touched by the ;; For a rebuild of the Flex/Bison byproducts touched by the
;; patch above. ;; patch above.
'(for-each delete-file '(begin
'("mh/mh_alias_lex.c" (for-each delete-file
"libmailutils/cfg/parser.c"))))) '("mh/mh_alias_lex.c"
"libmailutils/cfg/parser.c"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

59
gnu/packages/maths.scm
View file

@ -169,9 +169,11 @@ (define-public coda
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure we don't use the bundled software. ;; Make sure we don't use the bundled software.
'(for-each (lambda (d) '(begin
(delete-file-recursively (string-append "libcoda/" d))) (for-each (lambda (d)
'("zlib" "pcre" "expat"))))) (delete-file-recursively (string-append "libcoda/" d)))
'("zlib" "pcre" "expat"))
#t))))
(native-inputs (native-inputs
`(("fortran" ,gfortran) `(("fortran" ,gfortran)
("python" ,python) ("python" ,python)
@ -819,7 +821,8 @@ (define-public hdf-java
(for-each delete-file (for-each delete-file
(list "SZip.tar.gz" "ZLib.tar.gz" "JPEG8d.tar.gz" (list "SZip.tar.gz" "ZLib.tar.gz" "JPEG8d.tar.gz"
"HDF4.tar.gz" "HDF5.tar.gz")) "HDF4.tar.gz" "HDF5.tar.gz"))
(delete-file-recursively ,(string-append "hdfjava-" version "/lib")))))) (delete-file-recursively ,(string-append "hdfjava-" version "/lib"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("jdk" ,icedtea "jdk") `(("jdk" ,icedtea "jdk")
@ -1222,7 +1225,9 @@ (define-public ipopt
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure we don't use the bundled software. ;; Make sure we don't use the bundled software.
'(delete-file-recursively "ThirdParty")))) '(begin
(delete-file-recursively "ThirdParty")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -1446,7 +1451,9 @@ (define-public gmsh
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove non-free METIS code ;; Remove non-free METIS code
'(delete-file-recursively "contrib/Metis")))) '(begin
(delete-file-recursively "contrib/Metis")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(propagated-inputs (propagated-inputs
`(("fltk" ,fltk) `(("fltk" ,fltk)
@ -1980,7 +1987,8 @@ (define-public superlu
(let ((line (read-line in 'concat))) (let ((line (read-line in 'concat)))
(unless (regexp-exec rx line) (unless (regexp-exec rx line)
(display line out) (display line out)
(loop))))))))))) (loop))))
#t)))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("tcsh" ,tcsh))) `(("tcsh" ,tcsh)))
@ -2038,7 +2046,8 @@ (define-public superlu-dist
(delete-file "SRC/mc64ad.f.bak") (delete-file "SRC/mc64ad.f.bak")
(substitute* "SRC/util.c" ;adjust default algorithm (substitute* "SRC/util.c" ;adjust default algorithm
(("RowPerm[[:blank:]]*=[[:blank:]]*LargeDiag") (("RowPerm[[:blank:]]*=[[:blank:]]*LargeDiag")
"RowPerm = NOROWPERM")))) "RowPerm = NOROWPERM"))
#t))
(patches (search-patches "superlu-dist-scotchmetis.patch")))) (patches (search-patches "superlu-dist-scotchmetis.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -2887,7 +2896,9 @@ (define-public suitesparse
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled metis source ;; Remove bundled metis source
'(delete-file-recursively "metis-5.1.0")))) '(begin
(delete-file-recursively "metis-5.1.0")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ;no "check" target '(#:tests? #f ;no "check" target
@ -3083,19 +3094,21 @@ (define-public lpsolve
"12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0")) "12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* (list "lp_solve/ccc" "lpsolve55/ccc") '(begin
(("^c=cc") "c=gcc") (substitute* (list "lp_solve/ccc" "lpsolve55/ccc")
;; Pretend to be on a 64 bit platform to obtain a common directory (("^c=cc") "c=gcc")
;; name for the build results on all architectures; nothing else ;; Pretend to be on a 64 bit platform to obtain a common directory
;; seems to depend on it. ;; name for the build results on all architectures; nothing else
(("^PLATFORM=.*$") "PLATFORM=ux64\n") ;; seems to depend on it.
(("^PLATFORM=.*$") "PLATFORM=ux64\n")
;; The check for 'isnan' as it is written fails with ;; The check for 'isnan' as it is written fails with
;; "non-floating-point argument in call to function ;; "non-floating-point argument in call to function
;; ‘__builtin_isnan’", which leads to the 'NOISNAN' cpp macro ;; ‘__builtin_isnan’", which leads to the 'NOISNAN' cpp macro
;; definition, which in turn leads to bad things. Fix the feature ;; definition, which in turn leads to bad things. Fix the feature
;; test. ;; test.
(("isnan\\(0\\)") "isnan(0.)"))))) (("isnan\\(0\\)") "isnan(0.)"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -3153,7 +3166,9 @@ (define-public dealii
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled sources: UMFPACK, TBB, muParser, and boost ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
'(delete-file-recursively "bundled")))) '(begin
(delete-file-recursively "bundled")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("tbb" ,tbb) `(("tbb" ,tbb)

7
gnu/packages/messaging.scm
View file

@ -217,7 +217,8 @@ (define-public hexchat
'("intltool.m4" "libtool.m4" "lt~obsolete.m4" '("intltool.m4" "libtool.m4" "lt~obsolete.m4"
"ltoptions.m4" "ltsugar.m4" "ltversion.m4"))) "ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
(delete-file-recursively "build-aux") (delete-file-recursively "build-aux")
(delete-file "po/Makefile.in.in"))))) (delete-file "po/Makefile.in.in")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("autoconf-archive" ,autoconf-archive) ("autoconf-archive" ,autoconf-archive)
@ -1060,7 +1061,9 @@ (define-public perl-net-psyc
"1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42")) "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
;; psycmp3 currently depends on MP3::List and rxaudio (shareware), ;; psycmp3 currently depends on MP3::List and rxaudio (shareware),
;; we can add it back when this is no longer the case. ;; we can add it back when this is no longer the case.
(snippet '(delete-file "contrib/psycmp3")))) (snippet '(begin
(delete-file "contrib/psycmp3")
#t))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs (inputs
`(("perl-curses" ,perl-curses) `(("perl-curses" ,perl-curses)

8
gnu/packages/monitoring.scm
View file

@ -54,9 +54,11 @@ (define-public nagios
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Ensure reproducibility. ;; Ensure reproducibility.
'(substitute* (find-files "cgi" "\\.c$") '(begin
(("__DATE__") "\"1970-01-01\"") (substitute* (find-files "cgi" "\\.c$")
(("__TIME__") "\"00:00:00\""))))) (("__DATE__") "\"1970-01-01\"")
(("__TIME__") "\"00:00:00\""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))

12
gnu/packages/mp3.scm
View file

@ -120,7 +120,7 @@ (define-public id3lib
"0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97")) "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Don't use bundled zlib ;; Don't use bundled zlib
(snippet '(delete-file-recursively "zlib")) (snippet '(begin (delete-file-recursively "zlib") #t))
(patches (search-patches "id3lib-CVE-2007-4460.patch")))) (patches (search-patches "id3lib-CVE-2007-4460.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
@ -192,10 +192,12 @@ (define-public mp3info
"042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04")) "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(begin
(("/bin/rm") "rm") (substitute* "Makefile"
(("/usr/bin/install") "install") (("/bin/rm") "rm")
(("man/man1") "share/man/man1"))))) (("/usr/bin/install") "install")
(("man/man1") "share/man/man1"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "gui")) ;GTK+ interface in "gui" (outputs '("out" "gui")) ;GTK+ interface in "gui"
(arguments (arguments

61
gnu/packages/music.scm
View file

@ -203,29 +203,31 @@ (define-public clementine
"0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi")) "0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each '(begin
(for-each
(lambda (dir) (lambda (dir)
(delete-file-recursively (delete-file-recursively
(string-append "3rdparty/" dir))) (string-append "3rdparty/" dir)))
(list (list
;; TODO: The following dependencies are still bundled: ;; TODO: The following dependencies are still bundled:
;; - "qxt": Appears to be unmaintained upstream. ;; - "qxt": Appears to be unmaintained upstream.
;; - "qsqlite" ;; - "qsqlite"
;; - "qtsingleapplication" ;; - "qtsingleapplication"
;; - "qocoa" ;; - "qocoa"
;; - "qtiocompressor" ;; - "qtiocompressor"
;; - "gmock": The tests crash when using our googletest ;; - "gmock": The tests crash when using our googletest
;; package instead of the bundled gmock. ;; package instead of the bundled gmock.
"SPMediaKeyTap" "SPMediaKeyTap"
"fancytabwidget" "fancytabwidget"
"google-breakpad" "google-breakpad"
"libmygpo-qt" "libmygpo-qt"
"libmygpo-qt5" "libmygpo-qt5"
"libprojectm" "libprojectm"
"qtwin" "qtwin"
"sha2" ;; Replaced by openssl. "sha2" ;; Replaced by openssl.
"taglib" "taglib"
"tinysvcmdns"))) "tinysvcmdns"))
#t))
(patches (search-patches "clementine-use-openssl.patch" (patches (search-patches "clementine-use-openssl.patch"
"clementine-remove-crypto++-dependency.patch")))) "clementine-remove-crypto++-dependency.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -2607,7 +2609,8 @@ (define-public milkytracker
'(begin '(begin
(delete-file-recursively "resources/music") (delete-file-recursively "resources/music")
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("add_subdirectory\\(resources/music\\)") "")))))) (("add_subdirectory\\(resources/music\\)") ""))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
@ -2645,9 +2648,11 @@ (define-public schismtracker
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove use of __DATE__ and __TIME__ for reproducibility. ;; Remove use of __DATE__ and __TIME__ for reproducibility.
`(substitute* "schism/version.c" `(begin
(("Schism Tracker built %s %s.*$") (substitute* "schism/version.c"
(string-append "Schism Tracker version " ,version "\");")))))) (("Schism Tracker built %s %s.*$")
(string-append "Schism Tracker version " ,version "\");")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2762,9 +2767,11 @@ (define-public moc
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove use of __DATE__ and __TIME__ for reproducibility. ;; Remove use of __DATE__ and __TIME__ for reproducibility.
'(substitute* "main.c" '(begin
(("printf \\(\" Built : %s\", __DATE__\\);") "") (substitute* "main.c"
(("printf \\(\" %s\", __TIME__\\);") ""))))) (("printf \\(\" Built : %s\", __DATE__\\);") "")
(("printf \\(\" %s\", __TIME__\\);") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)

3
gnu/packages/netpbm.scm
View file

@ -94,7 +94,8 @@ (define-syntax drop
(("^DATE=.*") (("^DATE=.*")
"DATE=\"Thu Jan 01 00:00:00+0000 1970\"\n") "DATE=\"Thu Jan 01 00:00:00+0000 1970\"\n")
(("^USER=.*") (("^USER=.*")
"USER=Guix\n")))))) "USER=Guix\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("ghostscript" ,ghostscript) (inputs `(("ghostscript" ,ghostscript)

8
gnu/packages/networking.scm
View file

@ -394,9 +394,11 @@ (define-public ifstatus
"045cbsq9ps32j24v8y5hpyqxnqn9mpaf3mgvirlhgpqyb9jsia0c")) "045cbsq9ps32j24v8y5hpyqxnqn9mpaf3mgvirlhgpqyb9jsia0c"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Main.h" '(begin
(("#include <stdio.h>") (substitute* "Main.h"
"#include <stdio.h>\n#include <stdlib.h>"))))) (("#include <stdio.h>")
"#include <stdio.h>\n#include <stdlib.h>"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no "check" target '(#:tests? #f ; no "check" target

3
gnu/packages/node.scm
View file

@ -68,7 +68,8 @@ (define-public node
(("deps/http_parser/http_parser.gyp") "") (("deps/http_parser/http_parser.gyp") "")
(("deps/uv/include/\\*.h") "") (("deps/uv/include/\\*.h") "")
(("deps/uv/uv.gyp") "") (("deps/uv/uv.gyp") "")
(("deps/zlib/zlib.gyp") "")))))) (("deps/zlib/zlib.gyp") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; TODO: Purge the bundled copies from the source. ;; TODO: Purge the bundled copies from the source.

3
gnu/packages/nvi.scm
View file

@ -50,7 +50,8 @@ (define-public nvi
conf-wrap) conf-wrap)
(newline conf-wrap) (newline conf-wrap)
(close-output-port conf-wrap) (close-output-port conf-wrap)
(chmod "configure" #o0755))))) (chmod "configure" #o0755)
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

30
gnu/packages/ocaml.scm
View file

@ -100,7 +100,8 @@ (define (janestreet-origin name version hash)
;; in OCaml's directory in the store, which is read-only. ;; in OCaml's directory in the store, which is read-only.
(substitute* "Makefile" (substitute* "Makefile"
(("--prefix") (("--prefix")
"--libdir $(LIBDIR) --prefix"))))))) "--libdir $(LIBDIR) --prefix"))
#t)))))
;; They also require almost the same set of arguments ;; They also require almost the same set of arguments
(define janestreet-arguments (define janestreet-arguments
@ -781,7 +782,8 @@ (define-public unison
;; Without the '-fix' argument, the html file produced does not ;; Without the '-fix' argument, the html file produced does not
;; have functioning internal hyperlinks. ;; have functioning internal hyperlinks.
(substitute* "doc/Makefile" (substitute* "doc/Makefile"
(("hevea unison") "hevea -fix unison")))))) (("hevea unison") "hevea -fix unison"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 1.9 MiB of documentation "doc")) ; 1.9 MiB of documentation
@ -2196,17 +2198,19 @@ (define-public ocaml-oasis
"1ln7vc7ip6s5xbi20mhnn087xi4a2m5vqawx0703qqnfkzhmslqy")) "1ln7vc7ip6s5xbi20mhnn087xi4a2m5vqawx0703qqnfkzhmslqy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "test/test-main/Test.ml" '(begin
;; most of these tests fail because ld cannot find crti.o, but according (substitute* "test/test-main/Test.ml"
;; to the log file, the environment variables {LD_,}LIBRARY_PATH ;; most of these tests fail because ld cannot find crti.o, but according
;; are set correctly whene LD_LIBRARY_PATH is defined beforhand. ;; to the log file, the environment variables {LD_,}LIBRARY_PATH
(("TestBaseCompat.tests;") "") ;; are set correctly whene LD_LIBRARY_PATH is defined beforhand.
(("TestExamples.tests;") "") (("TestBaseCompat.tests;") "")
(("TestFull.tests;") "") (("TestExamples.tests;") "")
(("TestPluginDevFiles.tests;") "") (("TestFull.tests;") "")
(("TestPluginInternal.tests;") "") (("TestPluginDevFiles.tests;") "")
(("TestPluginOCamlbuild.tests;") "") (("TestPluginInternal.tests;") "")
(("TestPluginOMake.tests;") ""))))) (("TestPluginOCamlbuild.tests;") "")
(("TestPluginOMake.tests;") ""))
#t))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(native-inputs (native-inputs
`(("ocamlify" ,ocamlify) `(("ocamlify" ,ocamlify)

12
gnu/packages/pdf.scm
View file

@ -579,7 +579,7 @@ (define-public mupdf
(base32 (base32
"0b9j0gqbc3jhmx87r6idcsh8lnb30840c3hyx6dk2gdjqqh3hysp")) "0b9j0gqbc3jhmx87r6idcsh8lnb30840c3hyx6dk2gdjqqh3hysp"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(delete-file-recursively "thirdparty")))) (snippet '(begin (delete-file-recursively "thirdparty") #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
@ -631,12 +631,14 @@ (define-public qpdf
(snippet (snippet
;; Replace shebang with the bi-lingual shell/Perl trick to remove ;; Replace shebang with the bi-lingual shell/Perl trick to remove
;; dependency on Perl. ;; dependency on Perl.
'(substitute* "qpdf/fix-qdf" '(begin
(("#!/usr/bin/env perl") (substitute* "qpdf/fix-qdf"
"\ (("#!/usr/bin/env perl")
"\
eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}'
& eval 'exec perl -wS \"$0\" $argv:q' & eval 'exec perl -wS \"$0\" $argv:q'
if 0;\n"))))) if 0;\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:disallowed-references (,perl) `(#:disallowed-references (,perl)

3
gnu/packages/perl.scm
View file

@ -7489,7 +7489,8 @@ (define-public perl-sys-cpu
local $TODO = \"/proc/cpuinfo doesn't always report 'model name' or 'machine' ...\"; local $TODO = \"/proc/cpuinfo doesn't always report 'model name' or 'machine' ...\";
$type = &Sys::CPU::cpu_type(); $type = &Sys::CPU::cpu_type();
ok( defined($type), \"CPU Type: $type\" ); ok( defined($type), \"CPU Type: $type\" );
}~%"))))))) }~%")))
#t))))
(build-system perl-build-system) (build-system perl-build-system)
(synopsis "Perl extension for getting CPU information") (synopsis "Perl extension for getting CPU information")
(description (description

3
gnu/packages/php.scm
View file

@ -86,7 +86,8 @@ (define-public php
"pcre/pcrelib" "pcre/pcrelib"
"sqlite3/libsqlite" "sqlite3/libsqlite"
"xmlrpc/libxmlrpc" "xmlrpc/libxmlrpc"
"zip/lib")))))) "zip/lib"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

19
gnu/packages/plotutils.scm
View file

@ -60,9 +60,11 @@ (define-public plotutils
;; that, libplot.la ends up containing just "-lXaw" (without ;; that, libplot.la ends up containing just "-lXaw" (without
;; "-L/path/to/Xaw"), due to the fact that there is no ;; "-L/path/to/Xaw"), due to the fact that there is no
;; libXaw.la, which forces us to propagate libXaw. ;; libXaw.la, which forces us to propagate libXaw.
'(substitute* "configure" '(begin
(("-lXaw") (substitute* "configure"
"-lXaw7"))))) (("-lXaw")
"-lXaw7"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libpng" ,libpng) (inputs `(("libpng" ,libpng)
("libx11" ,libx11) ("libx11" ,libx11)
@ -97,7 +99,8 @@ (define-public guile-charting
;; Use the standard location for modules. ;; Use the standard location for modules.
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("godir = .*$") (("godir = .*$")
"godir = $(moddir)\n")))))) "godir = $(moddir)\n"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2)))
@ -123,9 +126,11 @@ (define-public ploticus
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Install binaries in the right place. ;; Install binaries in the right place.
'(substitute* "src/Makefile" '(begin
(("INSTALLBIN =.*$") (substitute* "src/Makefile"
(string-append "INSTALLBIN = $(out)/bin")))))) (("INSTALLBIN =.*$")
(string-append "INSTALLBIN = $(out)/bin")))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f

8
gnu/packages/pretty-print.scm
View file

@ -56,9 +56,11 @@ (define-public a2ps
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove timestamp from the installed 'README' file. ;; Remove timestamp from the installed 'README' file.
'(substitute* "etc/README.in" '(begin
(("@date@") (substitute* "etc/README.in"
"1st of some month, sometime after 1970"))) (("@date@")
"1st of some month, sometime after 1970"))
#t))
(patches (search-patches (patches (search-patches
"a2ps-CVE-2001-1593.patch" "a2ps-CVE-2001-1593.patch"
"a2ps-CVE-2014-0466.patch")))) "a2ps-CVE-2014-0466.patch"))))

6
gnu/packages/profiling.scm
View file

@ -350,8 +350,10 @@ (define (make-scorep mpi)
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled software. ;; Remove bundled software.
'(for-each delete-file-recursively '(begin
'("vendor/opari2" "vendor/cube"))))) (for-each delete-file-recursively
'("vendor/opari2" "vendor/cube"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("mpi" ,mpi) `(("mpi" ,mpi)

8
gnu/packages/pulseaudio.scm
View file

@ -144,9 +144,11 @@ (define-public pulseaudio
(snippet (snippet
;; Disable console-kit support by default since it's deprecated ;; Disable console-kit support by default since it's deprecated
;; anyway. ;; anyway.
'(substitute* "src/daemon/default.pa.in" '(begin
(("load-module module-console-kit" all) (substitute* "src/daemon/default.pa.in"
(string-append "#" all "\n")))) (("load-module module-console-kit" all)
(string-append "#" all "\n")))
#t))
(patches (search-patches (patches (search-patches
"pulseaudio-fix-mult-test.patch" "pulseaudio-fix-mult-test.patch"
"pulseaudio-longer-test-timeout.patch")))) "pulseaudio-longer-test-timeout.patch"))))

3
gnu/packages/python-crypto.scm
View file

@ -563,7 +563,8 @@ (define-public python-pynacl
(uri (pypi-uri "PyNaCl" version)) (uri (pypi-uri "PyNaCl" version))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove bundled libsodium ;; Remove bundled libsodium
(snippet '(delete-file-recursively "src/libsodium")) (snippet '(begin (delete-file-recursively "src/libsodium")
#t))
(sha256 (sha256
(base32 (base32
"135gz0020fqx8fbr9izpwyq49aww202nkqacq0cw61xz99sjpx9j")))) "135gz0020fqx8fbr9izpwyq49aww202nkqacq0cw61xz99sjpx9j"))))

3
gnu/packages/python.scm
View file

@ -3253,7 +3253,8 @@ (define-public python-numpydoc
;; input since it would create a circular dependency: Extend the ;; input since it would create a circular dependency: Extend the
;; test for Python 3, where it is already dropped, to Python 2. ;; test for Python 3, where it is already dropped, to Python 2.
(substitute* "numpydoc/tests/test_plot_directive.py" (substitute* "numpydoc/tests/test_plot_directive.py"
(("3") "2")))))) (("3") "2"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-sphinx" ,python-sphinx))) `(("python-sphinx" ,python-sphinx)))

25
gnu/packages/qt.scm
View file

@ -145,7 +145,8 @@ (define-public qt
"qtcanvas3d/examples/canvas3d/3rdparty")) "qtcanvas3d/examples/canvas3d/3rdparty"))
;; Tests depend on this example, which depends on the 3rd party code. ;; Tests depend on this example, which depends on the 3rd party code.
(substitute* "qtmultimedia/examples/multimedia/multimedia.pro" (substitute* "qtmultimedia/examples/multimedia/multimedia.pro"
(("spectrum") "#")))))) (("spectrum") "#"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("mesa" ,mesa))) `(("mesa" ,mesa)))
@ -287,7 +288,8 @@ (define-public qt-4
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove webkit module, which is not built. ;; Remove webkit module, which is not built.
'(delete-file-recursively "src/3rdparty/webkit")))) '(begin (delete-file-recursively "src/3rdparty/webkit")
#t))))
(inputs `(,@(alist-delete "harfbuzz" (inputs `(,@(alist-delete "harfbuzz"
(alist-delete "libjpeg" (package-inputs qt))) (alist-delete "libjpeg" (package-inputs qt)))
("libjepg" ,libjpeg-8) ("libjepg" ,libjpeg-8)
@ -686,8 +688,8 @@ (define-public qtimageformats
(base32 (base32
"1nfxvf96wh1smdmcsk4m9f7zg69fgp844f8772qpv6v4m20p1qb9")) "1nfxvf96wh1smdmcsk4m9f7zg69fgp844f8772qpv6v4m20p1qb9"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin (delete-file-recursively "src/3rdparty")
'(delete-file-recursively "src/3rdparty")))) #t))))
(native-inputs `()) (native-inputs `())
(inputs (inputs
`(("jasper" ,jasper) `(("jasper" ,jasper)
@ -901,7 +903,8 @@ (define-public qtmultimedia
"examples/multimedia/spectrum/3rdparty") "examples/multimedia/spectrum/3rdparty")
;; We also prevent the spectrum example from being built. ;; We also prevent the spectrum example from being built.
(substitute* "examples/multimedia/multimedia.pro" (substitute* "examples/multimedia/multimedia.pro"
(("spectrum") "#")))))) (("spectrum") "#"))
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -947,7 +950,8 @@ (define-public qtwayland
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; The examples try to build and cause the build to fail ;; The examples try to build and cause the build to fail
'(delete-file-recursively "examples")))) '(begin (delete-file-recursively "examples")
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -1233,7 +1237,8 @@ (define-public qtdeclarative-render2d
"0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3")) "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "tools/opengldummy/3rdparty")))) '(begin (delete-file-recursively "tools/opengldummy/3rdparty")
#t))))
(native-inputs `()) (native-inputs `())
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -1292,7 +1297,8 @@ (define-public qtscxml
(delete-file-recursively "tests/3rdparty") (delete-file-recursively "tests/3rdparty")
;; the scion test refers to the bundled 3rd party test code. ;; the scion test refers to the bundled 3rd party test code.
(substitute* "tests/auto/auto.pro" (substitute* "tests/auto/auto.pro"
(("scion") "#")))))) (("scion") "#"))
#t))))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)))
@ -1338,7 +1344,8 @@ (define-public qtcanvas3d
"0agdxgk7knf6zkjdi6316y2k9zq72wcg5zn3cbhw4hzjw81qadgg")) "0agdxgk7knf6zkjdi6316y2k9zq72wcg5zn3cbhw4hzjw81qadgg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "examples/canvas3d/3rdparty")))) '(begin (delete-file-recursively "examples/canvas3d/3rdparty")
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
;; Building the tests depends on the bundled 3rd party javascript files, ;; Building the tests depends on the bundled 3rd party javascript files,

10
gnu/packages/robotics.scm
View file

@ -91,10 +91,12 @@ (define-public aseba
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Add missing Qt5::Network. ;; Add missing Qt5::Network.
'(substitute* "targets/playground/CMakeLists.txt" '(begin
(("target_link_libraries(.*)\\$\\{EXTRA_LIBS\\}" _ middle) (substitute* "targets/playground/CMakeLists.txt"
(string-append "target_link_libraries" middle (("target_link_libraries(.*)\\$\\{EXTRA_LIBS\\}" _ middle)
" Qt5::Network ${EXTRA_LIBS}")))))) (string-append "target_link_libraries" middle
" Qt5::Network ${EXTRA_LIBS}")))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))

13
gnu/packages/sawfish.scm
View file

@ -87,10 +87,12 @@ (define-public rep-gtk
"0qslm2isyv22hffdpw0nh7xk8jw8cj3h5y7d40c9h5r833w7j6sz")) "0qslm2isyv22hffdpw0nh7xk8jw8cj3h5y7d40c9h5r833w7j6sz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile.in" '(begin
(("installdir=\\$\\(repexecdir\\)") (substitute* "Makefile.in"
;; Install libraries for librep to $out/lib/rep. (("installdir=\\$\\(repexecdir\\)")
"installdir=$(libdir)/rep"))))) ;; Install libraries for librep to $out/lib/rep.
"installdir=$(libdir)/rep"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:tests? #f)) ; no tests (arguments '(#:tests? #f)) ; no tests
(native-inputs (native-inputs
@ -127,7 +129,8 @@ (define-public sawfish
"REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):")) "REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):"))
(substitute* "src/Makefile.in" (substitute* "src/Makefile.in"
;; Install libraries for librep to $out/lib/rep. ;; Install libraries for librep to $out/lib/rep.
(("\\$\\(repexecdir\\)") "$(libdir)/rep")))))) (("\\$\\(repexecdir\\)") "$(libdir)/rep"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests

8
gnu/packages/scanner.scm
View file

@ -45,9 +45,11 @@ (define-public sane-backends-minimal
(snippet (snippet
;; Generated HTML files and udev rules normally embed a ;; Generated HTML files and udev rules normally embed a
;; timestamp. Work around that to build things reproducibly. ;; timestamp. Work around that to build things reproducibly.
'(substitute* "tools/sane-desc.c" '(begin
(("asctime \\(localtime \\(&current_time\\)\\)") (substitute* "tools/sane-desc.c"
"\"1970-01-01\""))))) (("asctime \\(localtime \\(&current_time\\)\\)")
"\"1970-01-01\""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

13
gnu/packages/scheme.scm
View file

@ -212,8 +212,10 @@ (define-public bigloo
;; Remove bundled libraries. ;; Remove bundled libraries.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each delete-file-recursively '(begin
'("gc" "gmp" "libuv"))))) (for-each delete-file-recursively
'("gc" "gmp" "libuv"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -609,9 +611,10 @@ (define (system-suffix)
(origin (origin
(method url-fetch/tarbomb) (method url-fetch/tarbomb)
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Remove binary code ;; Remove binary code
'(delete-file-recursively "scmutils/mit-scheme")) (delete-file-recursively "scmutils/mit-scheme")
#t))
(uri (string-append "http://groups.csail.mit.edu/mac/users/gjs/6946" (uri (string-append "http://groups.csail.mit.edu/mac/users/gjs/6946"
"/scmutils-tarballs/" name "-" version "/scmutils-tarballs/" name "-" version
"-x86-64-gnu-linux.tar.gz")) "-x86-64-gnu-linux.tar.gz"))

6
gnu/packages/scribus.scm
View file

@ -75,8 +75,10 @@ (define-public scribus
(snippet (snippet
;; Fix typo. Equivalent to patch at ;; Fix typo. Equivalent to patch at
;; https://bugs.scribus.net/view.php?id=14850 ;; https://bugs.scribus.net/view.php?id=14850
'(substitute* "cmake/modules/FindLIBPODOFO.cmake" '(begin
(("find_package\\(OPENSSL\\)") "find_package(OpenSSL)"))))) (substitute* "cmake/modules/FindLIBPODOFO.cmake"
(("find_package\\(OPENSSL\\)") "find_package(OpenSSL)"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no test target `(#:tests? #f ;no test target

14
gnu/packages/sdl.scm
View file

@ -369,9 +369,10 @@ (define-public sdl2-mixer
(string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-" (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-"
version ".tar.gz")) version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Remove bundled libraries. ;; Remove bundled libraries.
'(delete-file-recursively "external")) (delete-file-recursively "external")
#t))
(sha256 (sha256
(base32 (base32
"1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf")))) "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"))))
@ -388,9 +389,10 @@ (define-public sdl2-ttf
(string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-" (string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-"
version ".tar.gz")) version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet (begin
;; Remove bundled libraries. ;; Remove bundled libraries.
'(delete-file-recursively "external")) '(delete-file-recursively "external")
#t))
(sha256 (sha256
(base32 (base32
"0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl")))) "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"))))

8
gnu/packages/serialization.scm
View file

@ -108,10 +108,10 @@ (define-public msgpack
"cpp-" version "/msgpack-" version ".tar.gz")) "cpp-" version "/msgpack-" version ".tar.gz"))
(snippet (snippet
'(let ((p (open-file "msgpack.pc.in" "a"))) '(let ((p (open-file "msgpack.pc.in" "a")))
(begin (display
(display (string-append "Requires: " "zlib" "\n") p)
(string-append "Requires: " "zlib" "\n") p) (close-output-port p)
(close-output-port p)))) #t))
(sha256 (sha256
(base32 (base32
"18hzmyfg3mvnp7ab03nqdzzvqagkl42gygjpi4zv4i7aca2dmwf0")))) "18hzmyfg3mvnp7ab03nqdzzvqagkl42gygjpi4zv4i7aca2dmwf0"))))

7
gnu/packages/shells.scm
View file

@ -103,9 +103,10 @@ (define-public fish
"0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4")) "0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Don't try to install /etc/fish/config.fish. ;; Don't try to install /etc/fish/config.fish.
(snippet (snippet '(begin
'(substitute* "Makefile.in" (substitute* "Makefile.in"
((".*INSTALL.*sysconfdir.*fish.*") ""))))) ((".*INSTALL.*sysconfdir.*fish.*") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen))) `(("doxygen" ,doxygen)))

3
gnu/packages/slang.scm
View file

@ -51,7 +51,8 @@ (define-public slang
(substitute* "src/Makefile.in" (substitute* "src/Makefile.in"
(("/bin/ln") "ln")) (("/bin/ln") "ln"))
(substitute* "configure" (substitute* "configure"
(("-ltermcap") "")))))) (("-ltermcap") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:parallel-tests? #f '(#:parallel-tests? #f

3
gnu/packages/smalltalk.scm
View file

@ -100,7 +100,8 @@ (define-public squeak-vm
"ux_version = \"GNU\";\n")) "ux_version = \"GNU\";\n"))
(substitute* "unix/vm/config.cmake" (substitute* "unix/vm/config.cmake"
(("\\(VM_BUILD_STRING.*") (("\\(VM_BUILD_STRING.*")
"(VM_BUILD_STRING \\\"Built with GNU Guix\\\")")))))) "(VM_BUILD_STRING \\\"Built with GNU Guix\\\")"))
#t))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("dbus" ,dbus) ("dbus" ,dbus)

3
gnu/packages/ssh.scm
View file

@ -479,7 +479,8 @@ (define-public lsh
(("localhost") "127.0.0.1")) (("localhost") "127.0.0.1"))
(substitute* "src/testsuite/login-auth-test" (substitute* "src/testsuite/login-auth-test"
(("/bin/cat") "cat")))))) (("/bin/cat") "cat"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("m4" ,m4) `(("m4" ,m4)

3
gnu/packages/sync.scm
View file

@ -58,7 +58,8 @@ (define-public owncloud-client
;; qtsingleapplication have not yet been packaged, but all are ;; qtsingleapplication have not yet been packaged, but all are
;; explicitly used from the 3rdparty folder during build. ;; explicitly used from the 3rdparty folder during build.
;; We can also remove the macgoodies folder ;; We can also remove the macgoodies folder
(delete-file-recursively "src/3rdparty/qtmacgoodies"))))) (delete-file-recursively "src/3rdparty/qtmacgoodies")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases

5
gnu/packages/syncthing.scm
View file

@ -39,8 +39,9 @@ (define-public syncthing
"0nv5g9ymykl4316l2g3mnac77y2rx9ps4j2kg3pymxlq6qms2dij")) "0nv5g9ymykl4316l2g3mnac77y2rx9ps4j2kg3pymxlq6qms2dij"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code. ;; Delete bundled ("vendored") free software source code.
(snippet (snippet '(begin
'(delete-file-recursively "vendor")))) (delete-file-recursively "vendor")
#t))))
(build-system go-build-system) (build-system go-build-system)
;; The primary Syncthing executable goes to "out", while the auxiliary ;; The primary Syncthing executable goes to "out", while the auxiliary
;; server programs and utility tools go to "utils". This reduces the size ;; server programs and utility tools go to "utils". This reduces the size

8
gnu/packages/tbb.scm
View file

@ -40,9 +40,11 @@ (define-public tbb
"1i3zy87gyzw22fvajm039w6g822qzqn7jbmznc8y8c57qpqnf330")) "1i3zy87gyzw22fvajm039w6g822qzqn7jbmznc8y8c57qpqnf330"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "build/common.inc" '(begin
(("export tbb_build_prefix.+$") (substitute* "build/common.inc"
"export tbb_build_prefix?=guix\n"))))) (("export tbb_build_prefix.+$")
"export tbb_build_prefix?=guix\n"))
#t))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

45
gnu/packages/terminals.scm
View file

@ -239,7 +239,8 @@ (define-public kmscon
"") "")
;; Replace the call to 'sd_booted' by the truth value. ;; Replace the call to 'sd_booted' by the truth value.
(("sd_booted\\(\\)") (("sd_booted\\(\\)")
"1")))))) "1"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -462,26 +463,28 @@ (define-public cool-retro-term
"cool-retro-term-memory-leak-1.patch")) "cool-retro-term-memory-leak-1.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each (lambda (font) '(begin
(delete-file-recursively (for-each (lambda (font)
(string-append "app/qml/fonts/" font)) (delete-file-recursively
(substitute* '("app/qml/resources.qrc") (string-append "app/qml/fonts/" font))
(((string-append "<file>fonts/" font ".*")) (substitute* '("app/qml/resources.qrc")
""))) (((string-append "<file>fonts/" font ".*"))
'(;"1971-ibm-3278" ; BSD 3-clause "")))
"1977-apple2" ; Non-Free '(;;"1971-ibm-3278" ; BSD 3-clause
"1977-commodore-pet" ; Non-Free "1977-apple2" ; Non-Free
"1979-atari-400-800" ; Non-Free "1977-commodore-pet" ; Non-Free
"1982-commodore64" ; Non-Free "1979-atari-400-800" ; Non-Free
"1985-atari-st" ; ? "1982-commodore64" ; Non-Free
"1985-ibm-pc-vga" ; Unclear "1985-atari-st" ; ?
;"modern-fixedsys-excelsior" ; Redistributable "1985-ibm-pc-vga" ; Unclear
;"modern-hermit" ; SIL ;;"modern-fixedsys-excelsior" ; Redistributable
;"modern-inconsolata"; SIL ;;"modern-hermit" ; SIL
;"modern-pro-font-win-tweaked" ; X11 ;;"modern-inconsolata" ; SIL
;"modern-proggy-tiny"; X11 ;;"modern-pro-font-win-tweaked" ; X11
;"modern-terminus" ; SIL ;;"modern-proggy-tiny" ; X11
"modern-monaco"))))) ; Apple non-free ;;"modern-terminus" ; SIL
"modern-monaco")) ; Apple non-free
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)

4
gnu/packages/texinfo.scm
View file

@ -143,7 +143,9 @@ (define-public texi2html
;; timestamp so we don't trigger the rule to update PO files, ;; timestamp so we don't trigger the rule to update PO files,
;; which would require Gettext. ;; which would require Gettext.
;; See <http://bugs.gnu.org/18247>. ;; See <http://bugs.gnu.org/18247>.
'(utime "texi2html.pl" 0 0 0 0)))) '(begin
(utime "texi2html.pl" 0 0 0 0)
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl))) (inputs `(("perl" ,perl)))
(arguments (arguments

12
gnu/packages/text-editors.scm
View file

@ -214,7 +214,9 @@ (define-public e3
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove pre-built binaries. ;; Remove pre-built binaries.
(snippet '(delete-file-recursively "bin")))) (snippet '(begin
(delete-file-recursively "bin")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
@ -248,10 +250,10 @@ (define-public mg
(base32 (base32
"0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai")) "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(begin (substitute* "GNUmakefile"
(substitute* "GNUmakefile" (("/usr/bin/") ""))
(("/usr/bin/") "")))))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

7
gnu/packages/textutils.scm
View file

@ -93,10 +93,9 @@ (define-public recode
(base32 (base32
"0r4yhf7i7zp2nl2apyzz7r3i2in12n385hmr8zcfr18ly0ly530q")) "0r4yhf7i7zp2nl2apyzz7r3i2in12n385hmr8zcfr18ly0ly530q"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
`(begin (delete-file "tests/Recode.c")
(delete-file "tests/Recode.c") #t))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("python" ,python-2) `(("python" ,python-2)

3
gnu/packages/tls.scm
View file

@ -793,7 +793,8 @@ (define-public mbedtls-apache
'(begin '(begin
(substitute* "include/mbedtls/dhm.h" (substitute* "include/mbedtls/dhm.h"
(("#define MBEDTLS_DHM_RFC5114_MODP_P") (("#define MBEDTLS_DHM_RFC5114_MODP_P")
"#define MBEDTLS_DHM_RFC5114_MODP_2048_P")))))) "#define MBEDTLS_DHM_RFC5114_MODP_2048_P"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

2
gnu/packages/unrtf.scm
View file

@ -61,7 +61,7 @@ (define-public unrtf
#$grep "/bin:" #$sed "/bin:" #$grep "/bin:" #$sed "/bin:"
#$coreutils "/bin:" #$coreutils "/bin:"
(getenv "PATH"))) (getenv "PATH")))
(zero? (system* "autoreconf" "-vfi")))))) (invoke "autoreconf" "-vfi")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/unrtf/") (home-page "https://www.gnu.org/software/unrtf/")
(synopsis "Convert Rich Text Format documents to other formats") (synopsis "Convert Rich Text Format documents to other formats")

7
gnu/packages/version-control.scm
View file

@ -391,7 +391,9 @@ (define-public libgit2
(patches (search-patches "libgit2-0.25.1-mtime-0.patch")) (patches (search-patches "libgit2-0.25.1-mtime-0.patch"))
;; Remove bundled software. ;; Remove bundled software.
(snippet '(delete-file-recursively "deps")) (snippet '(begin
(delete-file-recursively "deps")
#t))
(modules '((guix build utils))))) (modules '((guix build utils)))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "debug")) (outputs '("out" "debug"))
@ -1716,7 +1718,8 @@ (define-public darcs
(("__TIME__") "\"00:00:00\"")) (("__TIME__") "\"00:00:00\""))
(substitute* "src/impossible.h" (substitute* "src/impossible.h"
(("__DATE__") "\"\"") (("__DATE__") "\"\"")
(("__TIME__") "\"\"")))))) (("__TIME__") "\"\""))
#t))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded" `(#:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded"

42
gnu/packages/video.scm
View file

@ -303,15 +303,15 @@ (define-public mkvtoolnix
(base32 (base32
"0hknnnnx9661igm1r73dc7aqxnnrl5a8yvyvr1nhd9ymn2klwpl5")) "0hknnnnx9661igm1r73dc7aqxnnrl5a8yvyvr1nhd9ymn2klwpl5"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(begin ;; Delete bundled libraries.
;; Delete bundled libraries. (for-each delete-file-recursively
(for-each delete-file-recursively '("lib/libebml"
'("lib/libebml" "lib/libmatroska"
"lib/libmatroska" "lib/nlohmann-json"
"lib/nlohmann-json" "lib/pugixml"
"lib/pugixml" "lib/utf8-cpp"))
"lib/utf8-cpp")))))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
@ -387,8 +387,9 @@ (define-public x265
(base32 (base32
"1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v")) "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(delete-file-recursively "source/compat/getopt")))) (delete-file-recursively "source/compat/getopt")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; tests are skipped if cpu-optimized code isn't built `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built
@ -1794,10 +1795,10 @@ (define-public mlt
(base32 (base32
"10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47")) "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; As of glibc 2.26, <xlocale.h> no longer is. ;; As of glibc 2.26, <xlocale.h> no longer is.
'(substitute* "src/framework/mlt_property.h" (substitute* "src/framework/mlt_property.h"
(("xlocale\\.h") "locale.h"))))) (("xlocale\\.h") "locale.h"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -1983,7 +1984,8 @@ (define-public libvdpau-va-gl
"1x2ag1f2fwa4yh1g5spv99w9x1m33hbxlqwyhm205ssq0ra234bx")) "1x2ag1f2fwa4yh1g5spv99w9x1m33hbxlqwyhm205ssq0ra234bx"))
(patches (search-patches "libvdpau-va-gl-unbundle.patch")) (patches (search-patches "libvdpau-va-gl-unbundle.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(delete-file-recursively "3rdparty")))) (snippet '(begin (delete-file-recursively "3rdparty")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f)) ; Tests require a running X11 server, with VA-API support. '(#:tests? #f)) ; Tests require a running X11 server, with VA-API support.
@ -2495,10 +2497,10 @@ (define-public livemedia-utils
(base32 (base32
"0f5kxpayqn3yhabqrd2cqlc74i6x2xr01jfkank1lcilxnfyrsnq")) "0f5kxpayqn3yhabqrd2cqlc74i6x2xr01jfkank1lcilxnfyrsnq"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; As of glibc 2.26, <xlocale.h> no longer is. ;; As of glibc 2.26, <xlocale.h> no longer is.
'(substitute* "liveMedia/include/Locale.hh" (substitute* "liveMedia/include/Locale.hh"
(("xlocale\\.h") "locale.h"))))) (("xlocale\\.h") "locale.h"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests

3
gnu/packages/vpn.scm
View file

@ -62,7 +62,8 @@ (define-public gvpe
(substitute* "lib/Makefile.in" (substitute* "lib/Makefile.in"
(("getopt1?\\.(c|h|\\$\\(OBJEXT\\))") "")) (("getopt1?\\.(c|h|\\$\\(OBJEXT\\))") ""))
(for-each delete-file (for-each delete-file
'("lib/getopt.h" "lib/getopt.c")))))) '("lib/getopt.h" "lib/getopt.c"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://software.schmorp.de/pkg/gvpe.html") (home-page "http://software.schmorp.de/pkg/gvpe.html")
(inputs `(("openssl" ,openssl) (inputs `(("openssl" ,openssl)

27
gnu/packages/web.scm
View file

@ -539,7 +539,8 @@ (define-public json-c
;; Don't try to build with -Werror. ;; Don't try to build with -Werror.
(substitute* (find-files "." "Makefile\\.in") (substitute* (find-files "." "Makefile\\.in")
(("-Werror") "")))))) (("-Werror") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:parallel-build? #f (arguments '(#:parallel-build? #f
#:parallel-tests? #f)) #:parallel-tests? #f))
@ -575,7 +576,8 @@ (define-public json-c-0.12
;; Don't try to build with -Werror. ;; Don't try to build with -Werror.
(substitute* (find-files "." "Makefile\\.in") (substitute* (find-files "." "Makefile\\.in")
(("-Werror") "")))))))) (("-Werror") ""))
#t))))))
(define-public qjson (define-public qjson
(package (package
@ -4836,10 +4838,10 @@ (define-public goaccess
(base32 (base32
"1w84y61f3ldg2f28q6qlyr1scn3mcx0bsbq3i5xi5w193wh3xa2q")) "1w84y61f3ldg2f28q6qlyr1scn3mcx0bsbq3i5xi5w193wh3xa2q"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(substitute* "src/error.h" (substitute* "src/error.h"
(("__DATE__") "\"1970-01-01\"") (("__DATE__") "\"1970-01-01\"")
(("__TIME__") "\"00:00:00\""))))) (("__TIME__") "\"00:00:00\""))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
;; TODO: Add dependency on geoip-tools. ;; TODO: Add dependency on geoip-tools.
@ -4869,9 +4871,9 @@ (define-public httptunnel
(base32 (base32
"0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql")) "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; Remove non-free IETF RFC documentation. ;; Remove non-free IETF RFC documentation.
'(delete-file-recursively "doc")))) (delete-file-recursively "doc")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -5005,9 +5007,10 @@ (define-public hiawatha
(uri (string-append "https://www.hiawatha-webserver.org/files/" (uri (string-append "https://www.hiawatha-webserver.org/files/"
"hiawatha-" version ".tar.gz")) "hiawatha-" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
;; We use our packaged mbedtls, so delete the included copy. ;; We use our packaged mbedtls, so delete the included copy.
'(delete-file-recursively "mbedtls")) (delete-file-recursively "mbedtls")
#t))
(sha256 (sha256
(base32 (base32
"0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin")))) "0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin"))))

21
gnu/packages/wm.scm
View file

@ -673,16 +673,17 @@ (define-public awesome
"0kwpbls9h1alxcmvxh5g9qb995fds5b2ngcr44w0ibazkyls2pdc")) "0kwpbls9h1alxcmvxh5g9qb995fds5b2ngcr44w0ibazkyls2pdc"))
(modules '((guix build utils) (modules '((guix build utils)
(srfi srfi-19))) (srfi srfi-19)))
(snippet (snippet '(begin
;; Remove non-reproducible timestamp and use the date of the ;; Remove non-reproducible timestamp and use the date
;; source file instead. ;; of the source file instead.
'(substitute* "common/version.c" (substitute* "common/version.c"
(("__DATE__ \" \" __TIME__") (("__DATE__ \" \" __TIME__")
(date->string (date->string
(time-utc->date (time-utc->date
(make-time time-utc 0 (make-time time-utc 0
(stat:mtime (stat "awesome.c")))) (stat:mtime (stat "awesome.c"))))
"\"~c\"")))) "\"~c\"")))
#t))
(patches (search-patches "awesome-reproducible-png.patch")))) (patches (search-patches "awesome-reproducible-png.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs `(("asciidoc" ,asciidoc) (native-inputs `(("asciidoc" ,asciidoc)

3
gnu/packages/wxwidgets.scm
View file

@ -184,7 +184,8 @@ (define-public python2-wxpython
;; setup.py tries to keep its own license the same as wxwidget's ;; setup.py tries to keep its own license the same as wxwidget's
;; license (which it expects under $WXWIN/docs). ;; license (which it expects under $WXWIN/docs).
(("'preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt'") (("'preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt'")
"")))))) ""))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2

16
gnu/packages/xdisorg.scm
View file

@ -90,11 +90,13 @@ (define-public arandr
"1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv")) "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Do not record a timestamp and file name in gzipped man '(begin
;; pages (this is equivalent to 'gzip --no-name'.) ;; Do not record a timestamp and file name in gzipped man
'(substitute* "setup.py" ;; pages (this is equivalent to 'gzip --no-name'.)
(("gzip\\.open\\(gzfile, 'w', 9\\)") (substitute* "setup.py"
"gzip.GzipFile('', 'wb', 9, open(gzfile, 'wb'), 0.)"))))) (("gzip\\.open\\(gzfile, 'w', 9\\)")
"gzip.GzipFile('', 'wb', 9, open(gzfile, 'wb'), 0.)"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 ;incompatible with python 3 `(#:python ,python-2 ;incompatible with python 3
@ -1274,7 +1276,9 @@ (define-public xcb-util-xrm
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Drop bundled m4. ;; Drop bundled m4.
'(delete-file-recursively "m4")))) '(begin
(delete-file-recursively "m4")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)

10
gnu/packages/xorg.scm
View file

@ -425,10 +425,12 @@ (define (%xorg-font-origin font version hash)
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Do not include timestamps in '.pcf.gz' files. ;; Do not include timestamps in '.pcf.gz' files.
'(substitute* "Makefile.in" '(begin
(("^COMPRESS = (.*)$" _ rest) (substitute* "Makefile.in"
(string-append "COMPRESS = " (string-trim-right rest) (("^COMPRESS = (.*)$" _ rest)
" --no-name\n")))))) (string-append "COMPRESS = " (string-trim-right rest)
" --no-name\n")))
#t))))
(define-syntax-rule (xorg-font-origin font version hash) (define-syntax-rule (xorg-font-origin font version hash)
"Expand to the 'origin' form for the given Xorg font package." "Expand to the 'origin' form for the given Xorg font package."