diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-10-30 21:36:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 21:36:07 +0100 |
commit | 628b6cc6795f7209717476a82a2a7b37df4e05f7 (patch) | |
tree | 1e140fc81e99effd8eec1d529401f721b19caa25 /pkgs/applications/networking | |
parent | 0a24919923ca4d2a6fc995aa06c3c4ee27b2b318 (diff) | |
parent | b4c54485bfd8a39d4cfd742c1689dfd8b3a59eb6 (diff) | |
download | nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.tar nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.tar.gz nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.tar.bz2 nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.tar.lz nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.tar.xz nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.tar.zst nixlib-628b6cc6795f7209717476a82a2a7b37df4e05f7.zip |
Merge pull request #49254 from jtojnar/remmina-cleanup
remmina: clean up
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index e823977db204..81ced3e641bc 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, libdbusmenu-gtk3, libappindicator-gtk3 @@ -7,24 +7,11 @@ , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme -, gnomeSupport ? true, libgnome-keyring }: with stdenv.lib; -let - - desktopItem = makeDesktopItem { - name = "remmina"; - desktopName = "Remmina"; - genericName = "Remmina Remote Desktop Client"; - exec = "remmina"; - icon = "remmina"; - comment = "Connect to remote desktops"; - categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "remmina-${version}"; version = "1.2.32"; @@ -35,22 +22,16 @@ in stdenv.mkDerivation rec { sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; buildInputs = [ - cmake wrapGAppsHook gsettings-desktop-schemas + gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp libssh libgcrypt gnutls pcre libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core openssl hicolor-icon-theme adwaita-icon-theme json-glib - ] - ++ optional gnomeSupport libgnome-keyring; - - preConfigure = optionalString (!gnomeSupport) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(remmina-plugins-gnome)" "" - ''; + ]; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -68,13 +49,8 @@ in stdenv.mkDerivation rec { ) ''; - postInstall = '' - mkdir -pv $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - meta = { - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+"; maintainers = with maintainers; [ melsigl ryantm ]; |