diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
| commit | 6af7c2b178b4d9bf16aced8bbfc1518643425f13 (patch) | |
| tree | c71a79116d94659576096362907160d5b82b367d /gnu/local.mk | |
| parent | 869250809bddcf8eab26ecdedabad6fc060751dd (diff) | |
| parent | e921234d02c926b5a95498aed1280b6346dd0878 (diff) | |
| download | guix-6af7c2b178b4d9bf16aced8bbfc1518643425f13.tar guix-6af7c2b178b4d9bf16aced8bbfc1518643425f13.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9ae23d1a23..4ed341df8f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -651,6 +651,7 @@ dist_patch_DATA = \ %D%/packages/patches/elogind-glibc-2.27.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/emacs-exec-path.patch \ + %D%/packages/patches/emacs-exwm-fix-fullscreen-issue.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ @@ -805,6 +806,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ + %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/jamvm-arm.patch \ @@ -1096,6 +1098,7 @@ 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/qtwebkit-pbutils-include.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoison-shell.patch \ @@ -1217,7 +1220,6 @@ dist_patch_DATA = \ %D%/packages/patches/x265-fix-ppc64le-build.patch \ %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ - %D%/packages/patches/xdotool-fix-makefile.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ |