diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-26 07:03:25 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-26 07:03:25 +0000 |
commit | f3ac7c55ecad87d72ba0aef5635cd32be7813722 (patch) | |
tree | 0f0c6372dde8e16c6b6838e955f892683a6828a4 /pkgs/applications/office | |
parent | d737607b56cbfdfa5a19688cc08106aacf6cb462 (diff) |
Updating the go_oo expression to not to break the tarball (thanks to Rob)
svn path=/nixpkgs/trunk/; revision=21982
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/openoffice/go-oo.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index bdf0939d64e19..ccf9238533fee 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -4,17 +4,18 @@ , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 -, autoconf, openldap, postgresql +, autoconf, openldap, postgresql, bash , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] }: -let version = "3.2.0"; in +let + langsSpaces = stdenv.lib.concatStringsSep " " langs; +in stdenv.mkDerivation rec { name = "go-oo-3.2.0.10"; # builder = ./builder.sh; downloadRoot = "http://download.services.openoffice.org/files/stable"; - versionDirs = true; src = fetchurl { url = "http://download.go-oo.org/OOO320/ooo-build-3.2.0.10.tar.gz"; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { # Multi-CPU: --with-num-cpus=4 configurePhase = '' - sed -i -e '1s,/bin/bash,${stdenv.bash}/bin/bash,' $(find bin -type f) + 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 echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in @@ -128,13 +129,11 @@ stdenv.mkDerivation rec { ant autoconf openldap postgresql ]; - langsSpaces = stdenv.lib.concatStringsSep " " langs; - meta = { description = "Go-oo - Novell variant of OpenOffice.org"; homepage = http://go-oo.org/; license = "LGPL"; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = [ stdenv.lib.platforms.linux ]; + platforms = stdenv.lib.platforms.linux; }; } |