diff options
| author | Bastian Köcher <git@kchr.de> | 2017-12-01 13:05:45 +0100 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2017-12-01 13:07:57 +0100 |
| commit | 623d8590011787fc19aab8ae3bec546a70043666 (patch) | |
| tree | 95c9f98808bf5ba96fb00743e96d0304aed26ccc /pkgs/applications/misc/redis-desktop-manager | |
| parent | d7fb70918041028845740f3a89d8b2694645bfc0 (diff) | |
| download | nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.tar nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.tar.gz nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.tar.bz2 nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.tar.lz nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.tar.xz nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.tar.zst nixpkgs-623d8590011787fc19aab8ae3bec546a70043666.zip | |
redis-desktop-manager: 0.8.3 -> 0.9.0-alpha5
- Fixes build with latest Qt and glibc. - Switches to Qt 5.9
Diffstat (limited to 'pkgs/applications/misc/redis-desktop-manager')
| -rw-r--r-- | pkgs/applications/misc/redis-desktop-manager/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 59d22b967b5..ca65e4bf7f8 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchgit, pkgconfig , libssh2 +{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols -, qtsvg, qttools, qtquick1 +, qtsvg, qttools, qtquick1, qtcharts , qmake }: @@ -15,30 +15,35 @@ in stdenv.mkDerivation rec { name = "redis-desktop-manager-${version}"; - version = "0.8.3"; + version = "0.9.0-alpha5"; src = fetchgit { url = "https://github.com/uglide/RedisDesktopManager.git"; fetchSubmodules = true; rev = "refs/tags/${version}"; - sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr"; + sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9"; }; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats - qtquick1 qtquickcontrols qtsvg qttools + qtquick1 qtquickcontrols qtsvg qttools qtcharts ]; + patches = [ + (fetchpatch { + url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch"; + sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq"; + }) + ]; + + patchFlags = "-d 3rdparty/gbreakpad -p1"; + dontUseQmakeConfigure = true; buildPhase = '' srcdir=$PWD - substituteInPlace src/resources/qml/ValueTabs.qml \ - --replace "import QtQuick.Controls 1.4" \ - "import QtQuick.Controls 1.2" - cat <<EOF > src/version.h #ifndef RDM_VERSION #define RDM_VERSION "${version}-120" |