From 5acc2fef255e0ea81f7c6867c48aed4693204550 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 21 Jan 2014 22:20:21 +0100 Subject: fix keepassx under gcc 4.8 --- pkgs/applications/misc/keepassx/default.nix | 2 ++ pkgs/applications/misc/keepassx/random.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/misc/keepassx/random.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index 375a1ae2419..fc089f4fa5b 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { qmake PREFIX=$out ''; + patches = [ ./random.patch ]; + buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ]; meta = { diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/applications/misc/keepassx/random.patch new file mode 100644 index 00000000000..0a0b26f6e8c --- /dev/null +++ b/pkgs/applications/misc/keepassx/random.patch @@ -0,0 +1,13 @@ +--- a/src/lib/random.cpp 2014-01-21 21:15:55.829312723 +0000 ++++ b/src/lib/random.cpp 2014-01-21 21:16:36.752535839 +0000 +@@ -28,6 +28,10 @@ + #include + #include + #endif ++#ifndef Q_WS_WIN ++ #include ++ #include ++#endif + + #include + #include -- cgit 1.4.1