diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-10-26 22:17:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-10-29 01:22:52 -0400 |
| commit | a06193603b7e7922439fc5a9d616b7ef872b8b03 (patch) | |
| tree | 857e11491324139734598037cc0a3774d694a751 /gnu/local.mk | |
| parent | ce23c5ffd2cbb123943c424f09d1442f557a14ed (diff) | |
| download | guix-a06193603b7e7922439fc5a9d616b7ef872b8b03.tar guix-a06193603b7e7922439fc5a9d616b7ef872b8b03.tar.gz | |
gnu: icecat: Include generally-useful fixes in the source tarball.
This commit moves some important fixes into a patch applied to the upstream
gnuzilla git repository, whereas previously they were applied in such a way
that only benefitted Guix users.
* gnu/packages/patches/icecat-default-search-ddg.patch,
gnu/packages/patches/icecat-disable-sync.patch: Delete files.
* gnu/packages/patches/icecat-gnuzilla-fixes.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adapt accordingly.
* gnu/packages/gnuzilla.scm (icecat-source): Apply the new patch to the
gnuzilla checkout.
(icecat)[native-inputs]: Remove deleted patches.
[arguments]: In the 'wrap-program' phase, remove MOZ_LEGACY_PROFILES=1
from the wrapper.
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 5b81791542..1b04485422 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -975,9 +975,8 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ + %D%/packages/patches/icecat-gnuzilla-fixes.patch \ %D%/packages/patches/icecat-makeicecat.patch \ - %D%/packages/patches/icecat-default-search-ddg.patch \ - %D%/packages/patches/icecat-disable-sync.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ |