diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-01-21 22:20:21 +0100 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-01-21 22:20:21 +0100 |
| commit | 5acc2fef255e0ea81f7c6867c48aed4693204550 (patch) | |
| tree | 5c2c2f88b9c728e50d5da5ad8a37e0db1e02d444 /pkgs/applications | |
| parent | a34d00f3b4d1a14bd25cef8417488701310908cf (diff) | |
| download | nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.tar nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.tar.gz nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.tar.bz2 nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.tar.lz nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.tar.xz nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.tar.zst nixpkgs-5acc2fef255e0ea81f7c6867c48aed4693204550.zip | |
fix keepassx under gcc 4.8
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/keepassx/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/keepassx/random.patch | 13 |
2 files changed, 15 insertions, 0 deletions
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 <wincrypt.h> + #include <QSysInfo> + #endif ++#ifndef Q_WS_WIN ++ #include <sys/types.h> ++ #include <unistd.h> ++#endif + + #include <QCryptographicHash> + #include <QCursor> |