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

remmina: 1.2.0-rcgit.15 -> 1.2.0-rcgit.17

Browse Source 
We also drop the embedded freerdp in favour of freerdp from upstream.
This commit is contained in:
Peter Hoeg
2017-02-05 14:05:31 +08:00
parent 5dbbdce047
commit 94b0128cc6
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/remote/remmina/default.nix
+13 -21
View File
@@ -10,7 +10,7 @@
}: }:
let let
version = "1.2.0-rcgit.15"; version = "1.2.0-rcgit.17";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "remmina"; name = "remmina";
@@ -22,41 +22,33 @@ let
categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
}; };
# Latest release of remmina refers to thing that aren't yet in in stdenv.mkDerivation {
# a FreeRDP release so we need to build one from git source
# See also https://github.com/FreeRDP/Remmina/pull/731
# Remove when FreeRDP release catches up with this commit
freerdp_git = stdenv.lib.overrideDerivation freerdp (args: {
name = "freerdp-git-2016-09-30";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec";
sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y";
};
});
in
stdenv.mkDerivation {
name = "remmina-${version}"; name = "remmina-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FreeRDP"; owner = "FreeRDP";
repo = "Remmina"; repo = "Remmina";
rev = "v${version}"; rev = "v${version}";
sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1";
}; };
buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas
glib gtk3 gettext libxkbfile libgnome_keyring libX11 glib gtk3 gettext libxkbfile libgnome_keyring libX11
freerdp_git libssh libgcrypt gnutls freerdp libssh libgcrypt gnutls
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret spice_protocol spice_gtk epoxy at_spi2_core libsecret spice_protocol spice_gtk epoxy at_spi2_core
openssl hicolor_icon_theme adwaita-icon-theme ]; openssl hicolor_icon_theme adwaita-icon-theme ];
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; cmakeFlags = [
"-DWITH_VTE=OFF"
"-DWITH_TELEPATHY=OFF"
"-DWITH_AVAHI=OFF"
"-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so"
"-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so"
"-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so"
"-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2"
];
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(