diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-22 10:17:38 -0800 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-22 10:17:38 -0800 |
| commit | 004b8d24f603670edc1ee45ceb170cb32974088c (patch) | |
| tree | 9141875aa16ed00b83b84c87e05bda6d5a6baadd /pkgs | |
| parent | c1811d0304978db69b420ce530fb81b1993e2509 (diff) | |
| parent | 5acc2fef255e0ea81f7c6867c48aed4693204550 (diff) | |
| download | nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.tar nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.tar.gz nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.tar.bz2 nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.tar.lz nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.tar.xz nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.tar.zst nixlib-004b8d24f603670edc1ee45ceb170cb32974088c.zip | |
Merge pull request #1564 from aristidb/master
fix keepassx under gcc 4.8
Diffstat (limited to 'pkgs')
| -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 375a1ae2419a..fc089f4fa5b7 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 000000000000..0a0b26f6e8c9 --- /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> |