treewide: stdenv.lib -> lib
This commit is contained in:
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \
|
||||
--set-rpath "${lib.makeLibraryPath buildInputs}" \
|
||||
$out/bin/anydesk
|
||||
|
||||
# pangox is not actually necessary (it was only added as a part of gtkglext)
|
||||
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
|
||||
$out/bin/anydesk
|
||||
|
||||
wrapProgram $out/bin/anydesk \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ lsb-release ]}
|
||||
|
||||
substituteInPlace $out/share/applications/*.desktop \
|
||||
--subst-var out
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook
|
||||
{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook
|
||||
, enableCredssp ? (!stdenv.isDarwin)
|
||||
} :
|
||||
|
||||
@@ -15,18 +15,18 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
nativeBuildInputs = [pkgconfig autoreconfHook];
|
||||
buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls]
|
||||
++ stdenv.lib.optional enableCredssp krb5;
|
||||
++ lib.optional enableCredssp krb5;
|
||||
|
||||
configureFlags = [
|
||||
"--with-ipv6"
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--disable-smartcard"
|
||||
] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp";
|
||||
] ++ lib.optional (!enableCredssp) "--disable-credssp";
|
||||
|
||||
meta = {
|
||||
description = "Open source client for Windows Terminal Services";
|
||||
homepage = "http://www.rdesktop.org/";
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
|
||||
, glib, gtk3, gettext, libxkbfile, libX11
|
||||
, freerdp, libssh, libgcrypt, gnutls
|
||||
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
@@ -9,7 +9,7 @@
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remmina";
|
||||
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Remote desktop application, server component";
|
||||
homepage = "http://x2go.org/";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.averelld ];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user