about summary refs log tree commit diff
path: root/pkgs/applications/networking/remote
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-10-03 01:47:08 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-10-03 01:47:08 +0200
commitb3fcd9375d89060979ce67d13c6714ebc3e1c002 (patch)
treee5120c8684e77b7b579c5fd348915cecdca66c57 /pkgs/applications/networking/remote
parent3a4658ea04d66e849aa29c1f747ab8becc14949c (diff)
parent3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff)
downloadnixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar
nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.gz
nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.bz2
nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.lz
nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.xz
nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.zst
nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r--pkgs/applications/networking/remote/putty/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 3b7db7075bb5..d8dc33c944e2 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
   };
 
+  # glib-2.62 deprecations
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
   preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
     perl mkfiles.pl
     ( cd doc ; make );