HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: webkitgtk: Fix build on i686.
[jackhill/guix/guix.git] / gnu / local.mk
diff --git a/gnu/local.mk b/gnu/local.mk
index 586be80..41924a7 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -231,6 +231,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gxmessage.scm                   \
   %D%/packages/hardware.scm                    \
   %D%/packages/haskell.scm                     \
+  %D%/packages/haskell-apps.scm                        \
   %D%/packages/haskell-check.scm               \
   %D%/packages/haskell-crypto.scm              \
   %D%/packages/haskell-web.scm                 \
@@ -342,6 +343,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/ninja.scm                       \
   %D%/packages/node.scm                                \
   %D%/packages/noweb.scm                       \
+  %D%/packages/nss.scm                         \
   %D%/packages/ntp.scm                         \
   %D%/packages/nutrition.scm                   \
   %D%/packages/nvi.scm                         \
@@ -372,6 +374,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/php.scm                         \
   %D%/packages/pkg-config.scm                  \
   %D%/packages/plotutils.scm                   \
+  %D%/packages/poedit.scm                              \
   %D%/packages/polkit.scm                      \
   %D%/packages/popt.scm                                \
   %D%/packages/printers.scm                    \
@@ -584,9 +587,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/tests/virtualization.scm                 \
   %D%/tests/web.scm
 
-if ENABLE_INSTALLER
-
-GNU_SYSTEM_MODULES +=                           \
+INSTALLER_MODULES =                             \
   %D%/installer.scm                            \
   %D%/installer/connman.scm                    \
   %D%/installer/final.scm                      \
@@ -618,13 +619,19 @@ GNU_SYSTEM_MODULES +=                           \
   %D%/installer/newt/welcome.scm               \
   %D%/installer/newt/wifi.scm  
 
+# Always ship the installer modules but compile them only when
+# ENABLE_INSTALLER is true.
+if ENABLE_INSTALLER
+GNU_SYSTEM_MODULES += $(INSTALLER_MODULES)
+else !ENABLE_INSTALLER
+MODULES_NOT_COMPILED += $(INSTALLER_MODULES)
+endif
+
 installerdir = $(guilemoduledir)/%D%/installer
 dist_installer_DATA =                          \
   %D%/installer/aux-files/logo.txt             \
   %D%/installer/aux-files/SUPPORTED
 
-endif ENABLE_INSTALLER
-
 # Modules that do not need to be compiled.
 MODULES_NOT_COMPILED +=                                \
   %D%/build/shepherd.scm                       \
@@ -745,6 +752,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
   %D%/packages/patches/emacs-realgud-fix-configure-ac.patch    \
+  %D%/packages/patches/emacs-undohist-ignored.patch    \
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch       \
   %D%/packages/patches/emacs-zones-called-interactively.patch  \
   %D%/packages/patches/enlightenment-fix-setuid-path.patch     \
@@ -771,6 +779,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/findutils-localstatedir.patch           \
   %D%/packages/patches/findutils-makedev.patch                 \
   %D%/packages/patches/findutils-test-xargs.patch              \
+  %D%/packages/patches/flac-CVE-2017-6888.patch                \
   %D%/packages/patches/flann-cmake-3.11.patch                  \
   %D%/packages/patches/flint-ldconfig.patch                    \
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch    \
@@ -911,6 +920,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
+  %D%/packages/patches/idris-test-no-node.patch                        \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
   %D%/packages/patches/inkscape-poppler-compat3.patch          \
   %D%/packages/patches/intltool-perl-compatibility.patch       \
@@ -930,6 +940,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
   %D%/packages/patches/khmer-use-libraries.patch                \
   %D%/packages/patches/libziparchive-add-includes.patch                \
+  %D%/packages/patches/localed-xorg-keyboard.patch             \
   %D%/packages/patches/kiki-level-selection-crash.patch                \
   %D%/packages/patches/kiki-makefile.patch                     \
   %D%/packages/patches/kiki-missing-includes.patch             \
@@ -939,7 +950,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/kio-search-smbd-on-PATH.patch           \
   %D%/packages/patches/kmod-module-directory.patch             \
   %D%/packages/patches/kmscon-runtime-keymap-switch.patch      \
-  %D%/packages/patches/knot-include-system-lmdb-header.patch   \
   %D%/packages/patches/kpackage-allow-external-paths.patch     \
   %D%/packages/patches/kobodeluxe-paths.patch                  \
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch      \
@@ -947,11 +957,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch       \
   %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch     \
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch    \
+  %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch           \
   %D%/packages/patches/kodi-skip-test-449.patch                \
   %D%/packages/patches/laby-make-install.patch                 \
+  %D%/packages/patches/lcms-CVE-2018-16435.patch               \
   %D%/packages/patches/ldc-bootstrap-disable-tests.patch       \
   %D%/packages/patches/ldc-disable-phobos-tests.patch          \
-  %D%/packages/patches/ledger-fix-uninitialized.patch          \
   %D%/packages/patches/liba52-enable-pic.patch                 \
   %D%/packages/patches/liba52-link-with-libm.patch             \
   %D%/packages/patches/liba52-set-soname.patch                 \
@@ -987,8 +998,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libffi-3.2.1-complex-alpha.patch                \
   %D%/packages/patches/libjxr-fix-function-signature.patch     \
   %D%/packages/patches/libjxr-fix-typos.patch                  \
-  %D%/packages/patches/libopenshot-fixup-tests.patch           \
-  %D%/packages/patches/libopenshot-tests-with-system-libs.patch        \
   %D%/packages/patches/libotr-test-auth-fix.patch              \
   %D%/packages/patches/libmad-armv7-thumb-pt1.patch            \
   %D%/packages/patches/libmad-armv7-thumb-pt2.patch            \
@@ -1097,6 +1106,10 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/ocaml-CVE-2015-8869.patch               \
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch       \
   %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch     \
+  %D%/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch     \
+  %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch    \
+  %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch   \
+  %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch   \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/ola-readdir-r.patch                     \
   %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch      \
@@ -1208,9 +1221,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch       \
-  %D%/packages/patches/quilt-test-fix-regex.patch              \
-  %D%/packages/patches/quilt-getopt-nondigit-param.patch       \
-  %D%/packages/patches/quilt-getopt-second-separator.patch     \
   %D%/packages/patches/qtwebkit-pbutils-include.patch          \
   %D%/packages/patches/randomjungle-disable-static-build.patch \
   %D%/packages/patches/rapicorn-isnan.patch                    \
@@ -1268,7 +1278,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/swig-guile-gc.patch                     \
   %D%/packages/patches/swish-e-search.patch                    \
   %D%/packages/patches/swish-e-format-security.patch           \
-  %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch     \
   %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch  \
   %D%/packages/patches/t1lib-CVE-2010-2642.patch               \
   %D%/packages/patches/t1lib-CVE-2011-0764.patch               \
@@ -1334,6 +1343,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/wavpack-CVE-2018-6767.patch             \
   %D%/packages/patches/wavpack-CVE-2018-7253.patch             \
   %D%/packages/patches/wavpack-CVE-2018-7254.patch             \
+  %D%/packages/patches/webkitgtk-sse2.patch                    \
   %D%/packages/patches/weechat-python.patch                    \
   %D%/packages/patches/wicd-bitrate-none-fix.patch             \
   %D%/packages/patches/wicd-get-selected-profile-fix.patch     \
jackhill's copy of GNU Guix: https://guix.gnu.org/