diff options
author | John Ericson <mail@JohnEricson.me> | 2018-08-31 09:56:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 09:56:10 -0400 |
commit | 2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93 (patch) | |
tree | 46c1a6242a2243d6d6bd04d0dcb234056bc01c14 /pkgs/applications/networking/remote | |
parent | f7606a82ed6bbf93c015c01b4067c7529ab3e74e (diff) | |
parent | 0828e2d8c369604c56219bd7085256b984087280 (diff) | |
download | nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.gz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.bz2 nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.lz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.xz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.zst nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.zip |
Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases
treewide: Dont use obsolete platform aliases
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/anydesk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/putty/default.nix | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 0f107936be6f..cb3814b55f19 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -6,12 +6,12 @@ let sha256 = { "x86_64-linux" = "0g19sac4j3m1nf400vn6qcww7prqg2p4k4zsj74i109kk1396aa2"; "i686-linux" = "1dd4ai2pclav9g872xil3x67bxy32gvz9pb3w76383pcsdh5zh45"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { "x86_64-linux" = "amd64"; "i686-linux" = "i686"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); description = "Desktop sharing application, providing remote support and online meetings"; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e07bf7958f3f..13613774b7c2 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool +{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool , gtk2, halibut, ncurses, perl -, hostPlatform, lib }: +}: stdenv.mkDerivation rec { version = "0.70"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; - preConfigure = lib.optionalString hostPlatform.isUnix '' + preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); sed -e '/AM_PATH_GTK(/d' \ @@ -22,22 +22,23 @@ stdenv.mkDerivation rec { -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix - '' + lib.optionalString hostPlatform.isWindows '' + '' + lib.optionalString stdenv.hostPlatform.isWindows '' cd windows ''; TOOLPATH = stdenv.cc.targetPrefix; - makefile = if hostPlatform.isWindows then "Makefile.mgw" else null; + makefile = if stdenv.hostPlatform.isWindows then "Makefile.mgw" else null; - installPhase = if hostPlatform.isWindows then '' + installPhase = if stdenv.hostPlatform.isWindows then '' for exe in *.exe; do install -D $exe $out/bin/$exe done '' else null; nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; - buildInputs = [] - ++ lib.optionals hostPlatform.isUnix [ gtk2 ncurses ]; + buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ + gtk2 ncurses + ]; enableParallelBuilding = true; meta = with lib; { |