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/packages/qt.scm | |
| parent | a413bc8bd3c2c7d00d8d021a2224a59d26765dad (diff) | |
| parent | 5f6887e839c10f0c905969d07baca4e03f453e82 (diff) | |
| download | guix-b9212a5455304661d1e969ced5df63aa9b6b761f.tar guix-b9212a5455304661d1e969ced5df63aa9b6b761f.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8de1ffe398..3bc3145e8d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -104,7 +104,8 @@ X11 (yet).") (sha256 (base32 "0q6qzakq8xihw91xv310qi3vyylq7x2bzdkjgy8sqxii2lgbjzhv")) - (patches (list (search-patch "qt5-runpath.patch"))) + (patches (list (search-patch "qt5-conflicting-typedefs.patch") + (search-patch "qt5-runpath.patch"))) (snippet '(begin ;; Remove broken symlinks. |