diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-02 22:42:53 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-02 22:42:53 +0200 |
| commit | b9212a5455304661d1e969ced5df63aa9b6b761f (patch) | |
| tree | e2857c8336cc1dbae087ba4717707bc24b4df2dd /gnu-system.am | |
| parent | a413bc8bd3c2c7d00d8d021a2224a59d26765dad (diff) | |
| parent | 5f6887e839c10f0c905969d07baca4e03f453e82 (diff) | |
| download | guix-b9212a5455304661d1e969ced5df63aa9b6b761f.tar guix-b9212a5455304661d1e969ced5df63aa9b6b761f.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index 60901a6bc2..26228fccfa 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -421,6 +421,7 @@ dist_patch_DATA = \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-arm-link-spec-fix.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ + gnu/packages/patches/gcc-libvtv-runpath.patch \ gnu/packages/patches/geoclue-config.patch \ gnu/packages/patches/ghostscript-runpath.patch \ gnu/packages/patches/gitolite-openssh-6.8-compat.patch \ @@ -503,6 +504,7 @@ dist_patch_DATA = \ gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \ gnu/packages/patches/pavucontrol-sigsegv.patch \ gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \ + gnu/packages/patches/perl-module-pluggable-search.patch \ gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/perl-tk-x11-discover.patch \ @@ -526,6 +528,7 @@ dist_patch_DATA = \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ gnu/packages/patches/qt4-ldflags.patch \ gnu/packages/patches/qt4-tests.patch \ + gnu/packages/patches/qt5-conflicting-typedefs.patch \ gnu/packages/patches/qt5-runpath.patch \ gnu/packages/patches/ratpoison-shell.patch \ gnu/packages/patches/readline-link-ncurses.patch \ @@ -580,8 +583,7 @@ dist_patch_DATA = \ gnu/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = \ - gnu/packages/ld-wrapper.in \ - gnu/packages/ld-wrapper2.in + gnu/packages/ld-wrapper.in bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux |