diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-21 00:08:24 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-21 00:08:24 +0100 |
| commit | d210a4a8fa247406f0b0dfe2247cab13316b7da8 (patch) | |
| tree | 55a6be6af83e53784406d918402c89cc8657868f | |
| parent | d91df9a4bdc4977e6ac81a550307f02bdc623ff7 (diff) | |
| download | nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.tar nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.tar.gz nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.tar.bz2 nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.tar.lz nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.tar.xz nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.tar.zst nixlib-d210a4a8fa247406f0b0dfe2247cab13316b7da8.zip | |
goldendict: fix build with gcc47
| -rw-r--r-- | pkgs/applications/misc/goldendict/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/goldendict/gcc47.patch | 40 |
2 files changed, 41 insertions, 1 deletions
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index f7b8a511bc66..717d0a012a2c 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { cd ${name}-src tar xf ${src} ''; - patches = [ ./goldendict-paths.diff ]; + patches = [ ./goldendict-paths.diff ./gcc47.patch ]; patchFlags = "-p 0"; configurePhase = '' qmake diff --git a/pkgs/applications/misc/goldendict/gcc47.patch b/pkgs/applications/misc/goldendict/gcc47.patch new file mode 100644 index 000000000000..311dad4f6487 --- /dev/null +++ b/pkgs/applications/misc/goldendict/gcc47.patch @@ -0,0 +1,40 @@ +From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <kensington@gentoo.org> +Date: Fri, 20 Jul 2012 03:27:38 +1000 +Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes. + +--- + processwrapper.cc | 4 ++++ + qtsingleapplication/src/qtlocalpeer.cpp | 1 + + 2 files changed, 5 insertions(+) + +diff --git processwrapper.cc processwrapper.cc +index f7f3f19..86b985d 100644 +--- processwrapper.cc ++++ processwrapper.cc +@@ -2,6 +2,10 @@ + + #include <QtCore> + ++#if defined(Q_OS_UNIX) ++#include <unistd.h> ++#endif ++ + #ifdef Q_OS_WIN32 + + #include <windows.h> +diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp +index 382d182..506c142 100644 +--- qtsingleapplication/src/qtlocalpeer.cpp ++++ qtsingleapplication/src/qtlocalpeer.cpp +@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0; + #endif + #if defined(Q_OS_UNIX) + #include <time.h> ++#include <unistd.h> + #endif + + namespace QtLP_Private { +-- +1.7.11.1 + |