nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 11:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

retroshare: 0.5.5c -> 0.6.2

Browse Source
This commit is contained in:
Robin Gloster 2017-07-26 22:02:45 +02:00
parent b794459727
commit c1ca5acf19
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
3 changed files with 27 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pkgs/applications/networking/p2p/retroshare/0.6.nix
View File

@ -1,62 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }:
stdenv.mkDerivation {
name = "retroshare-0.6-git-fabc3a3";
src = fetchFromGitHub {
owner = "RetroShare";
repo = "RetroShare";
rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a";
sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x";
};
NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ];
patchPhase = ''
# Fix build error
sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
libretroshare/src/upnp/UPnPBase.cpp
# Extensions get installed
sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \
libretroshare/src/rsserver/rsinit.cc
# Where to find the bootstrap DHT bdboot.txt
sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \
libretroshare/src/rsserver/rsaccounts.cc
'';
# sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \
# retroshare-gui/src/retroshare-gui.pro \
# retroshare-nogui/src/retroshare-nogui.pro
buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ];
preConfigure = ''
qmakeFlags="$qmakeFlags DESTDIR=$out"
'';
# gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory
enableParallelBuilding = false;
postInstall = ''
mkdir -p $out/bin
mv $out/retroshare-nogui $out/bin
mv $out/RetroShare $out/bin
# plugins
mkdir -p $out/share/retroshare
mv $out/lib* $out/share/retroshare
# BT DHT bootstrap
cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare
'';
meta = with stdenv.lib; {
description = "";
homepage = http://retroshare.sourceforge.net/;
#license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
};
}

46
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -1,40 +1,44 @@
{ stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt }:
{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg
, qtmultimedia, qtx11extras, qttools }:
stdenv.mkDerivation {
name = "retroshare-0.5.5c";
stdenv.mkDerivation rec {
name = "retroshare-${version}";
version = "0.6.2";
src = fetchurl {
url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz;
sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp";
src = fetchFromGitHub {
owner = "RetroShare";
repo = "RetroShare";
rev = "v${version}";
sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8";
};
NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ];
# NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ];
patchPhase = ''
# Fix build error
sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
libretroshare/src/upnp/UPnPBase.cpp
# Extensions get installed
sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \
libretroshare/src/rsserver/rsinit.cc
# For bdboot.txt
sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \
libretroshare/src/rsserver/rsinit.cc
'';
buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
protobuf bzip2 libXScrnSaver curl libxml2 libxslt ];
sourceRoot = "retroshare-0.5.5/src";
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg
];
preConfigure = ''
qmakeFlags="$qmakeFlags DESTDIR=$out"
'';
# gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory
enableParallelBuilding = false;
postInstall = ''
mkdir -p $out/bin
mv $out/retroshare-nogui $out/bin
mv $out/RetroShare $out/bin
mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui
mv $out/RetroShare06 $out/bin/Retroshare
ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui
# plugins
mkdir -p $out/share/retroshare
@ -47,7 +51,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "";
homepage = http://retroshare.sourceforge.net/;
#license = licenses.bsd2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
};

5
pkgs/top-level/all-packages.nix
View File

@ -15898,9 +15898,8 @@ with pkgs;
remotebox = callPackage ../applications/virtualization/remotebox { };
retroshare = callPackage ../applications/networking/p2p/retroshare { };
retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
retroshare06 = retroshare;
ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { };