From cdfa550ca518105f44bda15339f6deddf7ff52b0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 7 Aug 2018 20:05:57 -0500 Subject: [PATCH 1/3] utillinux: fix build w/ncurses, which is ncursesw --- pkgs/os-specific/linux/util-linux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 1a7232afedb3..55673ccf0139 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { "--disable-use-tty-group" "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" "--disable-makeinstall-setuid" "--disable-makeinstall-chown" - (lib.withFeature (ncurses != null) "ncurses") + (lib.withFeature (ncurses != null) "ncursesw") (lib.withFeature (systemd != null) "systemd") (lib.withFeatureAs (systemd != null) "systemdsystemunitdir" "$bin/lib/systemd/system/") From 4596251dd194cb34c83f02c152800deb7deb9f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 10 Aug 2018 10:36:23 +0200 Subject: [PATCH 2/3] libtiff: add a comment about the patches --- pkgs/development/libraries/libtiff/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index d37e93e6f82f..bf0393fd89a6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { prePatch = let debian = fetchurl { + # When the URL disappears, it typically means that Debian has new patches + # (probably security) and updating to new tarball will apply them as well. url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz; sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f"; }; From 7b3036a4a2117378b199ab700c4ece2393a83df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 10 Aug 2018 17:53:27 +0200 Subject: [PATCH 3/3] gdbm: avoid a warning on Darwin This is just to minimize rebuilds. The actual bugfix doesn't seem to hurry, as the function has been returning void until now, so if the int returned isn't a meaningful value in some cases, nothing should happen yet. --- pkgs/development/libraries/gdbm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index ecab75fb0ea9..bbebcca6e2f0 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -2,6 +2,8 @@ stdenv.mkDerivation rec { name = "gdbm-1.17"; + # FIXME: remove on update to > 1.17 + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz";