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

Making openoffice build in chroot (where there is no root in /etc/passwd)

Browse Source 
svn path=/nixpkgs/trunk/; revision=19935
This commit is contained in:
Lluís Batlle i Rossell 2010-02-11 15:08:00 +00:00
parent 9be35372dc
commit 8da211ed32
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/office/openoffice/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
};
patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ];
patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
src_system = fetchurl {
url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=system&version=${version}";

25
pkgs/applications/office/openoffice/root-required.patch Normal file
View File

@ -0,0 +1,25 @@
As nix chroot environment does not have the 'root' as owner, we have to disable
the "owner=root" tar parameters when doing these tar files.
They are built at openoffice build time.
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index 3342aca..49679b1 100644
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
$(MISC)/$(TARGET)/empty.tar :
@$(MKDIRHIER) $(@:d)/empty
- @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ .
+ @tar -C $(MISC)/$(TARGET)/empty -cf $@ .
# --- packaging ---------------------------------------------------
@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar
-$(RM) -r $(MISC)$/$(@:b)
dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh
@$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp
- @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt
+ @tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt
@gzip < $@.tmp > $@
@$(RM) $@.tmp
$(RM) -r $(MISC)$/$(@:b)