public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

policycoreutils: fix build on i686 for ZHF

Browse Source
This commit is contained in:
Luca Bruno 2014-08-21 17:29:51 +02:00
parent 186589fdd1
commit dcf17d3d5d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/policycoreutils/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1lpwxr5hw3dwhlp2p7y8jcr18mvfcrclwd8c2idz3lmmb3pglk46"; sha256 = "1lpwxr5hw3dwhlp2p7y8jcr18mvfcrclwd8c2idz3lmmb3pglk46";
}; };
patchPhase = '' preConfigure = ''
substituteInPlace po/Makefile --replace /usr/bin/install install substituteInPlace po/Makefile --replace /usr/bin/install install
find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \; find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \;
''; '';
@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out) DESTDIR=$(out) LOCALEDIR=$(out)/share/locale"; makeFlags = "PREFIX=$(out) DESTDIR=$(out) LOCALEDIR=$(out)/share/locale";
patches = [ ./size_format.patch ];
patchFlags = [ "-p0" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SELinux policy core utilities"; description = "SELinux policy core utilities";
license = licenses.gpl2; license = licenses.gpl2;

11
pkgs/os-specific/linux/policycoreutils/size_format.patch Normal file
View File

@ -0,0 +1,11 @@
--- setfiles/restore.c.orig 2014-08-21 17:26:00.200788259 +0200
+++ setfiles/restore.c 2014-08-21 17:26:04.728888118 +0200
@@ -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;