Great! I already tried this and go-oo seems to work fine. There is only one wish I have and that is that openoffice.org icons are still missing. It would be much nicer (I guess) to have it automatically appear in the KDE application launcher and to have the ODF MIME types attached to it. Maybe you could 'steal' this from the modifications I made to the original openoffice.org expression?
-----Oorspronkelijk bericht----- Van: [email protected] namens Llus Batlle Verzonden: vr 4-6-2010 23:51 Aan: [email protected] Onderwerp: [Nix-commits] SVN commit: nix - 22154 - viric -nixpkgs/trunk/pkgs/applications/office/openoffice Author: viric Date: 2010-06-04 21:51:21 +0000 (Fri, 04 Jun 2010) New Revision: 22154 You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22154&view=rev Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/get-go-src.nix nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix nixpkgs/trunk/pkgs/applications/office/openoffice/go-srcs.nix Log: Attempt at updating go-oo. I also updated the get-go-src expression to get also the heavy upstream openoffice packages. By now it tries to take also a package for 'sdk', which it is not needed in fact; manual rework after running the get-go-src result script is enough. Changes: Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/get-go-src.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/office/openoffice/get-go-src.nix 2010-06-04 21:27:38 UTC (rev 22153) +++ nixpkgs/trunk/pkgs/applications/office/openoffice/get-go-src.nix 2010-06-04 21:51:21 UTC (rev 22154) @@ -11,6 +11,7 @@ let pkgsFun = import /etc/nixos/nixpkgs; pkgs = pkgsFun {}; + downloadRoot = "http://download.services.openoffice.org/files/stable/";; in with pkgs; @@ -30,7 +31,9 @@ ensureDir $out set +e - ./download --all | grep XXX | grep -v openoffice.bouncer | awk ' + ./download --all | grep XXX | + sed '/bouncer/s,\(.*\)http.*version=\([0-9.]\+\).*lang=\([a-z0-9]\+\).*\( .*\),\1${downloadRoot}\2/OOo_\2_src_\3.tar.bz2\4,' | + awk ' BEGIN { print "#!/bin/sh" print "echo \"{fetchurl} : [\" > go-srcs.nix" Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix 2010-06-04 21:27:38 UTC (rev 22153) +++ nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix 2010-06-04 21:51:21 UTC (rev 22154) @@ -10,43 +10,19 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; - downloadRoot = "http://download.services.openoffice.org/files/stable/";; - fileUrl = part: "${downloadRoot}3.2.0/OOo_3.2.0_src_${part}.tar.bz2"; - tag = "OOO320_m12"; + tag = "OOO320_m19"; + version = "3.2.1.3"; in stdenv.mkDerivation rec { - name = "go-oo-3.2.0.10"; + name = "go-oo-${version}"; # builder = ./builder.sh; - downloadRoot = "http://download.services.openoffice.org/files/stable";; - src = fetchurl { - url = "http://download.go-oo.org/OOO320/ooo-build-3.2.0.10.tar.gz";; - sha256 = "0g6n0m9pibn6cx12zslmknzy1p764nqj8vdf45l5flyls9aj3x21"; + url = "http://download.go-oo.org/OOO320/ooo-build-${version}.tar.gz";; + sha256 = "0c8y66ca9nsfbznjazblpszpvg20mgic2bnpffgqb6qlpji6iwd1"; }; - srcs_download = [ - (fetchurl { - url = fileUrl "binfilter"; - sha256 = "1jl3a3zyb03wzi297llr69qpnimdc99iv82yvgxy145hz21xbjra"; - }) - (fetchurl { - url = fileUrl "core"; - sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml"; - }) - (fetchurl { - url = fileUrl "extensions"; - sha256 = "1l2xby47pflcqbv3m6ihjsv89ax96lvpl76wklwlcn8vzclbfqk8"; - }) - (fetchurl { - url = fileUrl "system"; - sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp"; - }) - (fetchurl { - url = fileUrl "l10n"; - sha256 = "1sp4b9r6qiczw875swk7p8r8bdxdyrwr841xn53xxxfglc4njba9"; - }) - ] ++ (import ./go-srcs.nix { inherit fetchurl; }); + 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 @@ -54,7 +30,8 @@ # 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 bin/ooinstall bin/generate-bash-completion + 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 ./configure --with-distro=SUSE-11.1 --with-system-libwpd --without-git --with-system-cairo \ @@ -72,9 +49,6 @@ # Needed to find genccode PATH=$PATH:${icu}/sbin - # Take away a patch, that upstream already applied (3.2.0 specific) - sed -i -e 's,^connectivity-build-fix-mac.diff,#,' patches/dev300/apply - make build.prepare set -x @@ -148,6 +122,7 @@ --without-system-mozilla --without-system-libwps --without-system-libwpg + --without-system-redland ''; buildInputs = [ Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/go-srcs.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/office/openoffice/go-srcs.nix 2010-06-04 21:27:38 UTC (rev 22153) +++ nixpkgs/trunk/pkgs/applications/office/openoffice/go-srcs.nix 2010-06-04 21:51:21 UTC (rev 22154) @@ -1,11 +1,15 @@ {fetchurl} : [ (fetchurl { + url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_system.tar.bz2";; + sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc"; +}) +(fetchurl { url = "http://download.go-oo.org/src//seamonkey-1.1.14.source.tar.gz";; sha256 = "0fb0pv2w8583q65ja5x8wh6ah6i3kwwq99s4v8cn99g91v8xn9hr"; }) (fetchurl { - url = "http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.tar.bz2";; - sha256 = "1v55fl0n8zisn6gih99fn1c5vp6wl6cf0qh1nwlcx9ia76jnjj9k"; + url = "http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.1.tar.bz2";; + sha256 = "0wfq6xsiqdzmkq3zxhd0q4k7db9bhl027wy5z28pcnmv4li5h40b"; }) (fetchurl { url = "http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz";; @@ -16,6 +20,14 @@ sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; }) (fetchurl { + url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_core.tar.bz2";; + sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; +}) +(fetchurl { + url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_extensions.tar.bz2";; + sha256 = "0d5byyg0ac0xsi22cw4d857rpd1r3mm2j13ajfydgsn2d2ka7nrj"; +}) +(fetchurl { url = "http://download.go-oo.org//SRC680/extras-3.tar.bz2";; sha256 = "1s6cz92b2amfn135l6a2hras4qrd04kw5yyqli7xmb8xqa0m3y3c"; }) @@ -24,10 +36,22 @@ sha256 = "02v2xbq771zi09qw3k4zih95m1rjns4pwwpl51n0m34c0a00lhf0"; }) (fetchurl { + url = "http://multidimalgorithm.googlecode.com/files//mdds_0.3.0.tar.bz2";; + sha256 = "1zqxs2a1ah0vq2a5dypqclig2c85z0a8rz7b63vfsqxvd2258a2d"; +}) +(fetchurl { + url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_binfilter.tar.bz2";; + sha256 = "0nxh1rdw566i7nr5vjfxbankwy5lsd2maggcqz3m0chp7jgvsb6p"; +}) +(fetchurl { url = "http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll";; sha256 = "0g3529nr0nfhn3cygn8x931pqxnqq88nfc5h829xncr1j8ifaqzm"; }) (fetchurl { + url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_l10n.tar.bz2";; + sha256 = "0m3i3czwqcyc2mibldp1zx34wxw7ls7akb3jak75nc6i3h7ykmsm"; +}) +(fetchurl { url = "http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz";; sha256 = "1cdjmgpy0igrwlb5i1sm4s2yxvzbmqz6j7xnmmv3kpbx7z43zw78"; }) _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
_______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
