diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
commit | 072c01a28f865e9487df09aed7ddff328252fb36 (patch) | |
tree | 6df6e652915940255f294ed8998cce1c4c7c2d40 /nixpkgs/pkgs/applications/networking/remote | |
parent | 024b46ff20027c15322e5d868ecec42632556d4b (diff) | |
parent | 969cff2691a02b3d7e5468beda26c482d8986644 (diff) | |
download | nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.gz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.bz2 nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.lz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.xz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.zst nixlib-072c01a28f865e9487df09aed7ddff328252fb36.zip |
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/remote')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/remote/remmina/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index a53bea23e199..c2ae02e01491 100644 --- a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "15b0fnv7xra4fpmn2y4k2rpzcss30sd1dhnx7yvhs2zq12z2m0wi"; + sha256 = "1ld5ik2g4b95z9pynmwx8mqhblbfzr7a0v35pms89ig4ck1kvr5r"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index 3d65b7a621b3..87fe60c7740c 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh +{ stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh , makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4"; }; - buildInputs = [ cups libssh libXpm nxproxy openldap openssh + buildInputs = [ cups libssh libXpm nx-libs openldap openssh qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installTargets = [ "install_client" "install_man" ]; postInstall = '' - wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin:${openssh}/libexec"; + wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nx-libs}/bin:${openssh}/libexec"; ''; meta = with stdenv.lib; { |