diff options
| author | Andrew Morsillo <andrew@peeramid.org> | 2014-08-20 18:31:14 -0400 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-08-22 21:00:06 +0200 |
| commit | 8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70 (patch) | |
| tree | 4a05ad3f6d0b2c9c2cf11538fb0bf4456edd43ad /pkgs/applications | |
| parent | a147ddc42ce96608aa424f7b8b8784bd938958c7 (diff) | |
| download | nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.tar nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.tar.gz nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.tar.bz2 nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.tar.lz nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.tar.xz nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.tar.zst nixpkgs-8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70.zip | |
robomongo: update to 0.8.4 and fix broken build
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/robomongo/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/misc/robomongo/robomongo.patch | 13 |
2 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index ab8a803b7cb..8b0ba581612 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }: stdenv.mkDerivation { - name = "robomongo-0.8.3"; + name = "robomongo-0.8.4"; src = fetchurl { - url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz; - sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank"; + url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz; + sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc"; }; patches = [ ./robomongo.patch ]; @@ -17,9 +17,8 @@ stdenv.mkDerivation { meta = { homepage = "http://robomongo.org/"; description = "Query GUI for mongodb"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.amorsillo ]; - broken = true; }; } diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch index 2305ca732ea..3de6e940d9f 100644 --- a/pkgs/applications/misc/robomongo/robomongo.patch +++ b/pkgs/applications/misc/robomongo/robomongo.patch @@ -1,6 +1,7 @@ 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 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 --- 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 @@ -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_DIST_BASENAME=get_option('client-dist-basename'), 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" |