diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 4d8c1ee9dc40..99a698cf9db0 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool -, gtk2, halibut, ncurses, perl, darwin +{ stdenv, lib, fetchurl, cmake, perl, pkg-config +, gtk3, ncurses, darwin }: stdenv.mkDerivation rec { - version = "0.76"; + version = "0.80"; pname = "putty"; src = fetchurl { @@ -11,33 +11,12 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l"; + hash = "sha256-IBPIOnIbF1NSnpCQ98ODDo/kyAoHDMznZFObrbP2cIE="; }; - # glib-2.62 deprecations - env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' - perl mkfiles.pl - ( cd doc ; make ); - ./mkauto.sh - cd unix - '' + lib.optionalString stdenv.hostPlatform.isWindows '' - cd windows - ''; - - TOOLPATH = stdenv.cc.targetPrefix; - makefile = if stdenv.hostPlatform.isWindows then "Makefile.mgw" else null; - - 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 pkg-config ]; + nativeBuildInputs = [ cmake perl pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ - gtk2 ncurses + gtk3 ncurses ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74e75aacf5d5..cf26b1d1c5d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40855,7 +40855,7 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; putty = callPackage ../applications/networking/remote/putty { - gtk2 = gtk2-x11; + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }; qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };