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

Merged from trunk 

svn path=/nixpkgs/branches/stdenv-updates/; revision=21983
This commit is contained in:
Lluís Batlle i Rossell 2010-05-26 07:06:02 +00:00
parent bd9c968158
commit 5a9be6d9d9
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/rekonq/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl { stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
, v ? "0.4.0" }: , v ? "0.4.90" }:
stdenv.mkDerivation ( stdenv.mkDerivation (
builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; }) builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })

9
pkgs/applications/networking/browsers/rekonq/source.nix
View File

@ -3,12 +3,13 @@
builtins.listToAttrs builtins.listToAttrs
[ [
{ {
name = "0.4.0"; name = "0.4.90";
value = rec { value = rec {
name = "rekonq-0.4.0"; name = "rekonq-0.4.90";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; url = "http://kde-apps.org/CONTENT/content-files/94258-${name}.tar.bz2";
sha256 = "1dxpzkifqy85kwj94mhazan6f9glxvl7i02c50n3f0a12wiywwvy"; name = "${name}.tar.bz2";
sha256 = "1dmdx54asv0b4xzc8p5nadn92l8pks9cl1y9j8a46lsslwsjw3ws";
}; };
}; };
} }

13
pkgs/applications/office/openoffice/go-oo.nix
View File

@ -4,17 +4,18 @@
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
, autoconf, openldap, postgresql , autoconf, openldap, postgresql, bash
, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] , 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 { stdenv.mkDerivation rec {
name = "go-oo-3.2.0.10"; name = "go-oo-3.2.0.10";
# builder = ./builder.sh; # builder = ./builder.sh;
downloadRoot = "http://download.services.openoffice.org/files/stable"; downloadRoot = "http://download.services.openoffice.org/files/stable";
versionDirs = true;
src = fetchurl { src = fetchurl {
url = "http://download.go-oo.org/OOO320/ooo-build-3.2.0.10.tar.gz"; 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 # Multi-CPU: --with-num-cpus=4
configurePhase = '' 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 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 echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in
@ -128,13 +129,11 @@ stdenv.mkDerivation rec {
ant autoconf openldap postgresql ant autoconf openldap postgresql
]; ];
langsSpaces = stdenv.lib.concatStringsSep " " langs;
meta = { meta = {
description = "Go-oo - Novell variant of OpenOffice.org"; description = "Go-oo - Novell variant of OpenOffice.org";
homepage = http://go-oo.org/; homepage = http://go-oo.org/;
license = "LGPL"; license = "LGPL";
maintainers = [ stdenv.lib.maintainers.viric ]; maintainers = [ stdenv.lib.maintainers.viric ];
platforms = [ stdenv.lib.platforms.linux ]; platforms = stdenv.lib.platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -8260,7 +8260,7 @@ let
inherit stdenv fetchurl pam python tcsh libxslt perl zlib libjpeg inherit stdenv fetchurl pam python tcsh libxslt perl zlib libjpeg
expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron
curl libsndfile flex zip unzip libmspack getopt file cairo curl libsndfile flex zip unzip libmspack getopt file cairo
which icu jdk ant cups openssl bison boost gperf cppunit; which icu jdk ant cups openssl bison boost gperf cppunit bash;
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;