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

robomongo: update to 0.8.4 and fix broken build

This commit is contained in:
Andrew Morsillo 2014-08-20 18:31:14 -04:00 committed by Bjørn Forsman
parent a147ddc42c
commit 8a465c1dfa
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/robomongo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }: { stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "robomongo-0.8.3"; name = "robomongo-0.8.4";
src = fetchurl { src = fetchurl {
url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz; url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz;
sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank"; sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc";
}; };
patches = [ ./robomongo.patch ]; patches = [ ./robomongo.patch ];
@ -17,9 +17,8 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "http://robomongo.org/"; homepage = "http://robomongo.org/";
description = "Query GUI for mongodb"; description = "Query GUI for mongodb";
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.amorsillo ]; maintainers = [ stdenv.lib.maintainers.amorsillo ];
broken = true;
}; };
} }

13
pkgs/applications/misc/robomongo/robomongo.patch
View File

@ -1,6 +1,7 @@
Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
Fix typo in cmakelists Fix typo in cmakelists
Add stdint.h include to mongo driver src
diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
--- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400 --- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500 +++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500
@ -46,3 +47,15 @@ diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-pa
CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}', CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
CLIENT_DIST_BASENAME=get_option('client-dist-basename'), CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
CLIENT_LICENSE='#distsrc/client/LICENSE.txt', CLIENT_LICENSE='#distsrc/client/LICENSE.txt',
diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h
--- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h 2013-12-13 12:56:35.000000000 -0500
+++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h 2014-08-20 18:16:31.788396489 -0400
@@ -39,6 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
+#include <stdint.h>
#include "time.h"
#include "string.h"