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

Merge remote-tracking branch 'NixOS/master' into staging

Browse Source
This commit is contained in:
Matthew Bauer
2019-02-18 20:36:48 -05:00
parent a808baa5e5 266315c91d
commit b1bbd94bb6
183 changed files with 10841 additions and 3646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/remote/remmina/default.nix
+2 -2
View File
@@ -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 ];
pkgs/applications/networking/remote/x2goclient/default.nix
+3 -3
View File
@@ -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; {