Commit graph

81 commits

Author SHA1 Message Date
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov
912637f33a Enable/disable libreoffice build in nixpkgs.config, not in tree.
I've tried to use override instead of getConfig but failed because exception is
thrown before the function is called with force = true.

svn path=/nixpkgs/trunk/; revision=32131
2012-02-07 21:03:25 +00:00
Lluís Batlle i Rossell
3c5fee5243 I revert the previous change to libreoffice.
svn path=/nixpkgs/trunk/; revision=31885
2012-01-27 15:14:29 +00:00
Lluís Batlle i Rossell
29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Lluís Batlle i Rossell
06548b79e9 Adding what I have for today of libreoffice. It still does not build.
svn path=/nixpkgs/trunk/; revision=31839
2012-01-25 23:04:34 +00:00
Lluís Batlle i Rossell
7fc001306c I add some little code to fetch the srcs of libreoffice.
svn path=/nixpkgs/trunk/; revision=31838
2012-01-25 19:12:27 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
2e81976a34 * Apply xlib.patch to go-oo as well.
svn path=/nixpkgs/branches/x-updates/; revision=25985
2011-02-16 09:18:07 +00:00
Eelco Dolstra
4ac97e16b6 * Fix an OpenOffice build problem (http://hydra.nixos.org/build/911291).
Not tested.

svn path=/nixpkgs/branches/x-updates/; revision=25983
2011-02-15 16:06:33 +00:00
Lluís Batlle i Rossell
8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Lluís Batlle i Rossell
bca9914534 Blindly updating go-oo. As it has always been, not that they announced anything in their web.
I imagined the latest tarball name from the tags I saw in
http://cgit.freedesktop.org/libreoffice/build/log/?h=ooo-build-3-2-1
OOO_BUILD_3_2_1_6

svn path=/nixpkgs/trunk/; revision=24672
2010-11-11 22:16:35 +00:00
Ludovic Courtès
f8a04b6a20 OpenOffice.org: Fix `postPatch'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24655
2010-11-11 11:02:44 +00:00
Ludovic Courtès
cadb827ec2 OpenOffice.org: Fix typo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24654
2010-11-10 22:43:45 +00:00
Ludovic Courtès
4b6e0f0846 OpenOffice.org: Force compilation with GCC 4.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24652
2010-11-10 21:37:16 +00:00
Ludovic Courtès
1410156f2a OpenOffice.org 3.2.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24644
2010-11-10 16:22:29 +00:00
Lluís Batlle i Rossell
d8d47c4aa6 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.

svn path=/nixpkgs/trunk/; revision=22154
2010-06-04 21:51:21 +00:00
Lluís Batlle i Rossell
912041c58e go-oo 3.2.0.10 does not want l10n_rev2 from upstream, but l10n.
svn path=/nixpkgs/trunk/; revision=22074
2010-06-01 10:10:59 +00:00
Lluís Batlle i Rossell
433a3c6719 Removing an openoffice patch for 3.1.1 not needed anymore
svn path=/nixpkgs/trunk/; revision=22072
2010-06-01 09:41:32 +00:00
Lluís Batlle i Rossell
3a352968a3 Fixing the hash for openoffice l10n rev2
svn path=/nixpkgs/trunk/; revision=22071
2010-06-01 09:26:26 +00:00
Lluís Batlle i Rossell
a073f876ae Updating the go-oo srcs to a much more stable ones: those upstream, instead of gitweb generated tarballs.
And adding a nix derivation that will help preparing the go-srcs.nix when updating go-oo.

svn path=/nixpkgs/trunk/; revision=22070
2010-06-01 09:17:37 +00:00
Lluís Batlle i Rossell
f3ac7c55ec Updating the go_oo expression to not to break the tarball (thanks to Rob)
svn path=/nixpkgs/trunk/; revision=21982
2010-05-26 07:03:25 +00:00
Lluís Batlle i Rossell
a63c1f4c8a Fix for go-oo: forgotten symlink, to make all work: soffice.bin
svn path=/nixpkgs/trunk/; revision=21970
2010-05-25 17:37:39 +00:00
Lluís Batlle i Rossell
8b59ac89bf Adding go-oo in multiple languages. The expression and names can be improved, but at least
I reached a point where it works. Patches welcome - even without asking.
I should add a way to regenerate src.nix automatically too, but the information on what
to dowload is only inside their download script generated after configure.

There are more things that can be added: kde4 support, gstreamer, ...

I did not check that all the buildInputs are needed - most come from the old openoffice expression.

svn path=/nixpkgs/trunk/; revision=21969
2010-05-25 17:05:52 +00:00
Lluís Batlle i Rossell
0ff12ea30b Trying to fix the build of openoffice 3.2.0
svn path=/nixpkgs/trunk/; revision=21880
2010-05-19 16:46:48 +00:00
Lluís Batlle i Rossell
b4536c217f Fixing openoffice urls for 3.2.0
svn path=/nixpkgs/trunk/; revision=21853
2010-05-19 07:31:07 +00:00
Lluís Batlle i Rossell
84f61fadd1 OpenOffice.org update attempt to 3.2.0 - maybe it will work
I'll wait for the hydra report.

svn path=/nixpkgs/trunk/; revision=21850
2010-05-18 20:57:00 +00:00
Michael Raskin
8840dd10fe Fix the second URL
svn path=/nixpkgs/trunk/; revision=21090
2010-04-15 11:32:38 +00:00
Michael Raskin
554f09f582 Retrieve all hashes fom SVN history - forgot to specify them
svn path=/nixpkgs/trunk/; revision=21089
2010-04-15 11:15:08 +00:00
Michael Raskin
c1e12f2788 Temporary other OO.o mirror just to get the build working for now
svn path=/nixpkgs/trunk/; revision=21084
2010-04-15 08:44:54 +00:00
Michael Raskin
f7880c95a3 Roll back OO.o version; subscribe to build results
svn path=/nixpkgs/trunk/; revision=20964
2010-04-06 21:46:52 +00:00
Michael Raskin
3cc371de23 Try removing old patches
svn path=/nixpkgs/trunk/; revision=20961
2010-04-06 19:04:43 +00:00
Michael Raskin
1b2c0d3326 Try updating OO.o - old tarball unavailable anyway
svn path=/nixpkgs/trunk/; revision=20960
2010-04-06 17:30:51 +00:00
Lluís Batlle i Rossell
e1f0221bc3 As the main openoffice servers don't hold the 3.1.1 source anymore (This means I could
not find it), I update the URLs so it is taken from a mirror still having them.

I tried one at random from:
http://distribution.openoffice.org/mirrors/#mirrors
and it worked. They don't have older versions other than 3.1.1 though.

This also reverts the attempt from Sander updating the expression to 3.2.0, because
it failed. That deserves more effort.

svn path=/nixpkgs/trunk/; revision=20419
2010-03-05 17:09:34 +00:00
Sander van der Burg
0894348d60 Since OOo 3.1.1 is broken anyway, this is my first attempt in supporting 3.2.0
svn path=/nixpkgs/trunk/; revision=20414
2010-03-05 13:38:27 +00:00
Lluís Batlle i Rossell
8da211ed32 Making openoffice build in chroot (where there is no root in /etc/passwd)
svn path=/nixpkgs/trunk/; revision=19935
2010-02-11 15:08:00 +00:00
Sander van der Burg
f00b7292e7 Stole a patch from cblfs.cross-lfs.org to fix compilation errors with glibc 2.11
svn path=/nixpkgs/trunk/; revision=19431
2010-01-14 12:29:54 +00:00
Sander van der Burg
d72c439a26 The OpenOffice.org icons should work now. I really mean it this time
svn path=/nixpkgs/trunk/; revision=17854
2009-10-16 15:31:31 +00:00
Sander van der Burg
702871ef25 It appears that the OpenOffice.org desktop files are read only. Changing this so that they can be adapted
svn path=/nixpkgs/trunk/; revision=17853
2009-10-16 12:16:17 +00:00
Sander van der Burg
3c00ca8da0 Corrected path to the .desktop files. Why do I keep making these silly mistakes?
svn path=/nixpkgs/trunk/; revision=17846
2009-10-16 08:56:35 +00:00
Sander van der Burg
9dced99013 It seems that the OpenOffice.org desktop files have wrong icon identifiers. I corrected them now. Maybe I'll win the most wasted builtime award now
svn path=/nixpkgs/trunk/; revision=17835
2009-10-15 20:48:58 +00:00
Sander van der Burg
ea9a9e5fae Fixed directory name for OpenOffice icons, sorry everyone
svn path=/nixpkgs/trunk/; revision=17826
2009-10-15 13:00:43 +00:00
Sander van der Burg
2d6d11772f OpenOffice.org now includes icons so that the menu items will look much nicer in KDE
svn path=/nixpkgs/trunk/; revision=17817
2009-10-15 09:56:40 +00:00
Michael Raskin
4a0e45a859 A missing OO.o dependency located.. Why does not configure check for it in the very beginning..
svn path=/nixpkgs/trunk/; revision=17511
2009-09-29 15:36:33 +00:00
Michael Raskin
88db61f5cf OpenOffice update. It configures OK, but I prefer to let Hydra build it (old build failed anyway)
svn path=/nixpkgs/trunk/; revision=17504
2009-09-29 14:16:23 +00:00
Michael Raskin
b278358bf2 Update OpenOffice
svn path=/nixpkgs/trunk/; revision=17493
2009-09-29 09:22:04 +00:00
Sander van der Burg
ab75faaa82 Added a minor symlink to OpenOffice.org to make desktop files work
svn path=/nixpkgs/trunk/; revision=15582
2009-05-13 09:44:26 +00:00
Sander van der Burg
f6a4c64f0f Added desktop file support for openoffice.org
svn path=/nixpkgs/trunk/; revision=15579
2009-05-12 19:08:02 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Lluís Batlle i Rossell
ff894ae773 Fixing the openoffice build, to run with a single job.
svn path=/nixpkgs/trunk/; revision=15182
2009-04-20 13:51:31 +00:00