public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redis-desktop-manager: 0.8.3 -> 0.9.0-alpha5

Browse Source 
- Fixes build with latest Qt and glibc.
- Switches to Qt 5.9
This commit is contained in:
Bastian Köcher
2017-12-01 13:07:57 +01:00
parent d7fb709180
commit 623d859001
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/redis-desktop-manager/default.nix
+14 -9
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchgit, pkgconfig , libssh2 { stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
, qtsvg, qttools, qtquick1 , qtsvg, qttools, qtquick1, qtcharts
, qmake , qmake
}: }:
@@ -15,30 +15,35 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "redis-desktop-manager-${version}"; name = "redis-desktop-manager-${version}";
version = "0.8.3"; version = "0.9.0-alpha5";
src = fetchgit { src = fetchgit {
url = "https://github.com/uglide/RedisDesktopManager.git"; url = "https://github.com/uglide/RedisDesktopManager.git";
fetchSubmodules = true; fetchSubmodules = true;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr"; sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
}; };
nativeBuildInputs = [ pkgconfig qmake ]; nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ buildInputs = [
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats 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; dontUseQmakeConfigure = true;
buildPhase = '' buildPhase = ''
srcdir=$PWD srcdir=$PWD
substituteInPlace src/resources/qml/ValueTabs.qml \
--replace "import QtQuick.Controls 1.4" \
"import QtQuick.Controls 1.2"
cat <<EOF > src/version.h cat <<EOF > src/version.h
#ifndef RDM_VERSION #ifndef RDM_VERSION
#define RDM_VERSION "${version}-120" #define RDM_VERSION "${version}-120"
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -19523,7 +19523,7 @@ with pkgs;
pcre = pcre-cpp; 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 { }; robo3t = callPackage ../applications/misc/robo3t { };