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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/remote/rdesktop/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
buildInputs = [openssl libX11];
configureFlags = [
"--with-openssl=${openssl}"
"--with-openssl=${openssl.dev}"
"--disable-credssp"
"--disable-smartcard"
];
pkgs/applications/networking/remote/remmina/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
mkdir -pv $out/share/icons
cp ${desktopItem}/share/applications/* $out/share/applications
cp -r $out/share/remmina/icons/* $out/share/icons
wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib"
wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
'';
meta = with stdenv.lib; {
pkgs/applications/networking/remote/x2goclient/default.nix
+3 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }:
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
stdenv.mkDerivation rec {
name = "x2goclient-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
nativeBuildInputs = [ makeWrapper qmake4Hook ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace Makefile \
@@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
--replace "-o root -g root" ""
'';
preConfigure = ''
qmakeFlags="$qmakeFlags ETCDIR=$out/etc"
'';
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
enableParallelBuilding = true;