From ca673d66de1954537baa897d7267bfec41e8fcd5 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Sat, 29 Aug 2015 20:47:21 -0400 Subject: policycoreutils: fix i686-linux compilation error, closes #9544 This adds a patch to quiet a compiler warning which would be harmless except that it breaks the build due to use of -Werror. See http://hydra.nixos.org/build/25151888/nixlog/1 --- pkgs/os-specific/linux/policycoreutils/default.nix | 2 ++ pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch (limited to 'pkgs/os-specific/linux/policycoreutils') diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 4eb8394a4d3..1933523d9c2 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq"; }; + patches = [ ./fix-printf-type.patch ]; + postPatch = '' # Fix references to libsepol.a find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \; diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch new file mode 100644 index 00000000000..6ab2d6dccc7 --- /dev/null +++ b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch @@ -0,0 +1,12 @@ +diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c +--- policycoreutils-2.4/setfiles/restore.c 2015-02-02 09:38:10.000000000 -0500 ++++ policycoreutils-2.4.new/setfiles/restore.c 2015-08-29 20:44:13.693023222 -0400 +@@ -118,7 +118,7 @@ + r_opts->count++; + if (r_opts->count % STAR_COUNT == 0) { + if (r_opts->progress == 1) { +- fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT ); ++ fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT ); + } else { + if (r_opts->nfile > 0) { + progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100; -- cgit 1.4.1