mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge pull request #1564 from aristidb/master
fix keepassx under gcc 4.8
This commit is contained in:
commit
004b8d24f6
2 changed files with 15 additions and 0 deletions
|
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
||||||
qmake PREFIX=$out
|
qmake PREFIX=$out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
patches = [ ./random.patch ];
|
||||||
|
|
||||||
buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ];
|
buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
13
pkgs/applications/misc/keepassx/random.patch
Normal file
13
pkgs/applications/misc/keepassx/random.patch
Normal file
|
@ -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 <wincrypt.h>
|
||||||
|
#include <QSysInfo>
|
||||||
|
#endif
|
||||||
|
+#ifndef Q_WS_WIN
|
||||||
|
+ #include <sys/types.h>
|
||||||
|
+ #include <unistd.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include <QCryptographicHash>
|
||||||
|
#include <QCursor>
|
Loading…
Reference in a new issue