diff options
| author | Daniel Fox Franke <dfoxfranke@gmail.com> | 2015-08-29 20:47:21 -0400 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-08-31 09:39:07 +0200 |
| commit | ca673d66de1954537baa897d7267bfec41e8fcd5 (patch) | |
| tree | f1f2b55605e123fce1122a06f08dc5cbe606fb9a /pkgs/os-specific/linux/policycoreutils | |
| parent | 38e2c1586bdb6773c1dac0721a5c7c562216ad9b (diff) | |
| download | nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.tar nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.tar.gz nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.tar.bz2 nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.tar.lz nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.tar.xz nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.tar.zst nixpkgs-ca673d66de1954537baa897d7267bfec41e8fcd5.zip | |
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
Diffstat (limited to 'pkgs/os-specific/linux/policycoreutils')
| -rw-r--r-- | pkgs/os-specific/linux/policycoreutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch | 12 |
2 files changed, 14 insertions, 0 deletions
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; |