Author: viric
Date: Wed Jan 25 23:04:34 2012
New Revision: 31839
URL: https://nixos.org/websvn/nix/?rev=31839&sc=1
Log:
Adding what I have for today of libreoffice. It still does not build.
Added:
nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix
- copied, changed from r31837,
nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix
Modified:
nixpkgs/trunk/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh
nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice-srcs.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh
==============================================================================
---
nixpkgs/trunk/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh
Wed Jan 25 19:12:27 2012 (r31838)
+++
nixpkgs/trunk/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh
Wed Jan 25 23:04:34 2012 (r31839)
@@ -11,10 +11,9 @@
echo '{fetchurl} : ['
-# I skip, as I hope I'll not need: sdk testing
for a in artwork base bootstrap calc components extensions extras filters \
help impress libs-core libs-extern libs-extern-sys libs-gui postprocess \
- translations ure writer; do
+ translations ure writer sdk testing; do
URL=http://download.documentfoundation.org/libreoffice/src/$VERSIONBASE/libreoffice-$a-$VERSION.tar.bz2
Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice-srcs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice-srcs.nix
Wed Jan 25 19:12:27 2012 (r31838)
+++ nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice-srcs.nix
Wed Jan 25 23:04:34 2012 (r31839)
@@ -8,10 +8,6 @@
sha256 = "0f5rsyrn33iz0sny3wxsghv7c7yrbhas42yarb5rq958i3kpm6wz";
})
(fetchurl {
- url =
"http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-bootstrap-3.4.5.2.tar.bz2";;
- sha256 = "05xz6ykddrm6mrgl9jssr2xpg2ir0x6c1c3n1cph0mvd0hiz58x9";
-})
-(fetchurl {
url =
"http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-calc-3.4.5.2.tar.bz2";;
sha256 = "1l00y0qj1s9m31jmqg7q7bczxa5xsng388nqc9zc3vd6zjf4xy9i";
})
@@ -71,4 +67,12 @@
url =
"http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-writer-3.4.5.2.tar.bz2";;
sha256 = "0k7xf94abavdzpns1z13phl3vjz0xkfv2h5sn7rgpr3dy184klxh";
})
+(fetchurl {
+ url =
"http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-sdk-3.4.5.2.tar.bz2";;
+ sha256 = "1f9iv875aw9sic4gl45ik1vx24gpq9iarjl673wz6l0wxr6hgrgw";
+})
+(fetchurl {
+ url =
"http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-testing-3.4.5.2.tar.bz2";;
+ sha256 = "05sk3li5jgmjv722ncsr2i7arhmsvkkvmh4qw7xl70p8dpxhla8q";
+})
]
Copied and modified:
nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix (from r31837,
nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix Wed Jan 25
18:06:30 2012 (r31837, copy source)
+++ nixpkgs/trunk/pkgs/applications/office/openoffice/libreoffice.nix Wed Jan
25 23:04:34 2012 (r31839)
@@ -8,34 +8,23 @@
, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
}:
-let
- langsSpaces = stdenv.lib.concatStringsSep " " langs;
- tag = "OOO320_m19";
- version = "3.2.1.6";
-in
+throw "The expression for libreoffice is still not ready"
+
stdenv.mkDerivation rec {
- name = "go-oo-${version}";
- # builder = ./builder.sh;
+ name = "libreoffice-3.4.5.2";
+
+ srcs_download = import ./libreoffice-srcs.nix { inherit fetchurl; };
src = fetchurl {
- url = "http://download.go-oo.org/OOO320/ooo-build-${version}.tar.gz";;
- sha256 = "1l9kpg61wyqjsig5n6a7c7zyygbg09zsmn4q267c12zzpl5qpmxy";
- };
-
- srcs_download = import ./go-srcs.nix { inherit fetchurl; };
-
- # Multi-CPU: --with-num-cpus=4
- # The '--with-tag=XXXX' string I took from their 'configure' script. I write
it so it matches the
- # logic in the script for "upstream version for X.X.X". Look for that string
in the script.
- # We need '--without-split' when downloading directly usptream openoffice
src tarballs.
- configurePhase = ''
- sed -i -e '1s,/bin/bash,${bash}/bin/bash,' $(find bin -type f)
- sed -i -e '1s,/usr/bin/perl,${perl}/bin/perl,' download.in $(find bin
-type f)
- sed -i -e '1s,/usr/bin/python,${python}/bin/python,' bin/*.py
- echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in
+ url =
"http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-bootstrap-3.4.5.2.tar.bz2";;
+ sha256 = "05xz6ykddrm6mrgl9jssr2xpg2ir0x6c1c3n1cph0mvd0hiz58x9";
+ };
+
+ preConfigure = ''
+ sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' Makefile.in
bin/unpack-sources
- ./configure --with-distro=SUSE-11.1 --with-system-libwpd --without-git
--with-system-cairo \
- --with-lang="${langsSpaces}" --with-tag=${tag} --without-split
+ # Needed to find genccode
+ PATH=$PATH:${icu}/sbin
'';
buildPhase = ''
@@ -44,18 +33,10 @@
# take out the hash
cp -v $a src/$(echo $FILE | sed 's/[^-]*-//')
done
- sed '/-x $WGET/d' -i download
- ./download
-
- # Needed to find genccode
- PATH=$PATH:${icu}/sbin
-
- make build.prepare
- set -x
- pushd build/${tag}
-
- patch -p1 < ${./xlib.patch}
+ # Remove an exit 1, ignoring the lack of wget or curl
+ sed '/wget nor curl/{n;d}' -i download
+ ./download
# Fix svtools: hardcoded jpeg path
sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,'
solenv/inc/libs.mk
@@ -69,66 +50,73 @@
sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR,
redland/redland/makefile.mk \
redland/raptor/makefile.mk redland/rasqal/makefile.mk
- popd
+ # This to aovid using /lib:/usr/lib at linking
+ sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}'
solenv/gbuild/platform/unxgcc.mk
- set +x
- make
- '';
+ find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
- installPhase = ''
- bin/ooinstall $out
- ensureDir $out/bin
- for a in
$out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do
- ln -s $a $out/bin
- done
+ make
'';
- distroFlags = ''
- --with-vendor=NixPkgs
- --with-package-format=native
- --disable-epm
- --disable-fontooo
- --disable-gnome-vfs
- --disable-gnome-vfs
- --disable-mathmldtd
- --disable-mozilla
- --disable-odk
- --disable-pasf
- --disable-dbus
- --disable-kde
- --disable-kde4
- --disable-mono
- --disable-gstreamer
- --with-cairo
- --with-system-libs
- --with-system-python
- --with-system-boost
- --with-system-db
- --with-jdk-home=${jdk}
- --with-ant-home=${ant}
- --without-afms
- --without-dict
- --without-fonts
- --without-myspell-dicts
- --without-nas
- --without-ppds
- --without-system-agg
- --without-system-beanshell
- --without-system-hsqldb
- --without-system-xalan
- --without-system-xerces
- --without-system-xml-apis
- --without-system-xt
- --without-system-jars
- --without-system-hunspell
- --without-system-altlinuxhyph
- --without-system-lpsolve
- --without-system-graphite
- --without-system-mozilla
- --without-system-libwps
- --without-system-libwpg
- --without-system-redland
- '';
+ configureFlags = [
+ # Helpful, while testing the expression
+ # "--with-num-cpus=4"
+
+ "--enable-verbose"
+
+ # Without these, configure does not finish
+ "--disable-gnome-vfs"
+ "--disable-gstreamer"
+ "--disable-opengl"
+ "--without-junit"
+ "--without-system-mythes"
+
+ # Without this, it wants to download
+ "--with-cairo"
+ "--with-system-libs"
+ "--with-system-python"
+ "--with-system-boost"
+ "--with-system-db"
+
+ # I imagine this helps. Copied from go-oo.
+ "--disable-epm"
+ "--disable-fontooo"
+ "--disable-gnome-vfs"
+ "--disable-gnome-vfs"
+ "--disable-mathmldtd"
+ "--disable-mozilla"
+ "--disable-odk"
+ "--disable-pasf"
+ "--disable-dbus"
+ "--disable-kde"
+ "--disable-kde4"
+ "--disable-mono"
+ "--with-package-format=native"
+ "--with-jdk-home=${jdk}"
+ "--with-ant-home=${ant}"
+ "--without-afms"
+ "--without-dict"
+ "--without-fonts"
+ "--without-myspell-dicts"
+ "--without-nas"
+ "--without-ppds"
+ "--without-system-agg"
+ "--without-system-beanshell"
+ "--without-system-hsqldb"
+ "--without-system-xalan"
+ "--without-system-xerces"
+ "--without-system-xml-apis"
+ "--without-system-xt"
+ "--without-system-jars"
+ "--without-system-hunspell"
+ "--without-system-altlinuxhyph"
+ "--without-system-lpsolve"
+ "--without-system-graphite"
+ "--without-system-mozilla"
+ "--without-system-libwps"
+ "--without-system-libwpg"
+ "--without-system-redland"
+ ];
buildInputs = [
pam python tcsh libxslt perl ArchiveZip CompressZlib zlib
@@ -136,13 +124,12 @@
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
cups libXinerama openssl gperf GConf ORBit2
-
- ant autoconf openldap postgresql
+ ant autoconf openldap postgresql cppunit
];
meta = {
- description = "Go-oo - Novell variant of OpenOffice.org";
- homepage = http://go-oo.org/;
+ description = "Libre-office, variant of openoffice.org";
+ homepage = http://libreoffice.org/;
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jan 25 19:12:27
2012 (r31838)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jan 25 23:04:34
2012 (r31839)
@@ -7124,6 +7124,11 @@
librecad = callPackage ../applications/misc/librecad { };
+ libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix {
+ inherit (perlPackages) ArchiveZip CompressZlib;
+ inherit (gnome) GConf ORBit2;
+ };
+
lingot = callPackage ../applications/audio/lingot {
inherit (gnome) libglade;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
