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

* Qt updated to 4.4.3 in preparation of upgrading KDE to 4.2.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13974
This commit is contained in:
Eelco Dolstra 2009-02-03 16:32:56 +00:00
parent aecd8c4415
commit 6ed4aa7ecb
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/libraries/qt-4/default.nix
View File

@ -1,13 +1,15 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qt-4.4.0"; name = "qt-4.4.3";
src = fetchurl { src = fetchurl {
url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.0.tar.bz2; url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.bz2;
sha256 = "871dc71c6c905212f2fea7e6598362114a3b6097c220b0b251f8d159ee7d706e"; sha256 = "1nfdf1aj6vb7qyacsnjyjxrnaf44hz7vzykf6zra2znd87pglz51";
}; };
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
propagatedBuildInputs = [ propagatedBuildInputs = [
libXft libXft
libXrender libXrender
@ -37,14 +39,25 @@ stdenv.mkDerivation {
glib glib
libtiff libtiff
]; ];
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = "
configureFlags = ''
-v -no-separate-debug-info -release -v -no-separate-debug-info -release
-system-zlib -system-libpng -system-libjpeg -fast -system-zlib -system-libpng -system-libjpeg -fast
-qt-gif -confirm-license -qt-gif -confirm-license
-opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-qdbus -cups -glib -xfixes -qdbus -cups -glib -xfixes
-fontconfig -I${freetype}/include/freetype2"; -fontconfig -I${freetype}/include/freetype2
'';
patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf"; patchPhase = ''
substituteInPlace configure --replace /bin/pwd pwd
sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
'';
meta = {
homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
description = "A cross-platform application framework for C++";
};
} }

7
pkgs/development/libraries/qt-4/setup-hook.sh
View File

@ -1,6 +1,7 @@
export QTDIR=@out@ export QTDIR=@out@
if [ -n $qt4BadIncludes ]; then if [ -n $qt4BadIncludes ]; then
for d in @out@/include/*; do for d in @out@/include/*; do
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"; export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d";
done; done;
fi fi

4
pkgs/lib/default.nix
View File

@ -256,6 +256,7 @@ rec {
optionalString = cond: string: if cond then string else ""; optionalString = cond: string: if cond then string else "";
# Return the second argument if the first one is true or the empty version # Return the second argument if the first one is true or the empty version
# of the second argument. # of the second argument.
ifEnable = cond: val: ifEnable = cond: val:
@ -266,6 +267,7 @@ rec {
else if (val == true || val == false) then false else if (val == true || val == false) then false
else null; else null;
# Return a list of integers from `first' up to and including `last'. # Return a list of integers from `first' up to and including `last'.
range = first: last: range = first: last:
if builtins.lessThan last first if builtins.lessThan last first
@ -284,7 +286,7 @@ rec {
logicalOR = x: y: x || y; logicalOR = x: y: x || y;
logicalAND = x: y: x && y; logicalAND = x: y: x && y;
# Input : attrSet, [ [name default] ... ], name # Input : attrSet, [ [name default] ... ], name
# Output : its value or default. # Output : its value or default.
getValue = attrSet: argList: name: getValue = attrSet: argList: name:

12
pkgs/tools/system/which/default.nix
View File

@ -1,12 +1,16 @@
{stdenv, fetchurl, readline}: stdenv.mkDerivation { {stdenv, fetchurl, readline}:
stdenv.mkDerivation {
name = "which-2.20"; name = "which-2.20";
src = fetchurl { src = fetchurl {
url = mirror://gnu/which/which-2.20.tar.gz; url = mirror://gnu/which/which-2.20.tar.gz;
sha256 = "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl"; sha256 = "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl";
}; };
buildInputs = [readline]; buildInputs = [readline];
meta = {
homepage = http://ftp.gnu.org/gnu/which/;
};
} }