From b98e4c0516ce21521abc8af414f2ee537f56e2db Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 25 Aug 2019 19:30:17 +0200 Subject: getxbook: fix merge --- pkgs/applications/misc/getxbook/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 02d3474b2094..fff1b02b84ef 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,14 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ]; buildInputs = [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; homepage = https://njw.me.uk/getxbook/; -- cgit 1.4.1