redis-desktop-manager: 0.8.3 -> 0.9.0-alpha5
- Fixes build with latest Qt and glibc. - Switches to Qt 5.9
This commit is contained in:
parent
d7fb709180
commit
623d859001
@ -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"
|
||||
|
@ -19523,7 +19523,7 @@ with pkgs;
|
||||
pcre = pcre-cpp;
|
||||
});
|
||||
|
||||
redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { };
|
||||
redis-desktop-manager = libsForQt59.callPackage ../applications/misc/redis-desktop-manager { };
|
||||
|
||||
robo3t = callPackage ../applications/misc/robo3t { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user