diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 17:40:58 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 17:40:58 +0000 |
commit | e446dee4c3ce5581ffb5a8a92c37867a09338e48 (patch) | |
tree | 2b658e0b7ec6dfc7ab5250cef4fb951eb5412a9d /pkgs/development | |
parent | 615f0423e883c5617a90ef1fd3a128737f84139b (diff) | |
download | nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.tar nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.tar.gz nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.tar.bz2 nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.tar.lz nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.tar.xz nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.tar.zst nixpkgs-e446dee4c3ce5581ffb5a8a92c37867a09338e48.zip |
Backport r32353 from stdenv-udpates
* Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only one application still using it (Caneda), but upgrading it allowed it to build with Qt 4.7. Eelco, could you please fix the date in caneda version? svn path=/nixpkgs/trunk/; revision=32359
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.6/default.nix | 101 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh | 9 |
2 files changed, 0 insertions, 110 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix deleted file mode 100644 index 904e29beae9..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.6/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, fetchurl -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql -, perl, coreutils, libXi, sqlite, alsaLib -, buildDemos ? false, buildExamples ? false, useDocs ? true}: - -stdenv.mkDerivation rec { - name = "qt-4.6.3"; - - src = fetchurl { - url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz; - sha256 = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"; - }; - - preConfigure = '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/qt4 - " - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - postgresql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - buildInputs = [ perl ]; - - # libQtNetwork will call libQtCore for it to dlopen openssl. - NIX_LDFLAGS = "-rpath ${openssl}/lib"; - # Don't shrink the rpath, to keep ${openssl} in it. - dontPatchELF = 1; - - prefixKey = "-prefix "; - - configureFlags = '' - -v -no-separate-debug-info -release - -system-zlib -system-libpng -system-libjpeg -fast - -qt-gif -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - ${if buildDemos == true then "" else "-nomake demos"} - ${if buildExamples == true then "" else "-nomake examples"} - ${if useDocs then "" else "-nomake docs"} - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; - - enableParallelBuilding = true; - - meta = { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh deleted file mode 100644 index f9ecacbbb7d..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -export QTDIR=@out@ - -if [ -n "$includeAllQtDirs" ]; then - # This helps for g++, but not for moc. And no qt4 package should expect - # having all qt4 header files dirs into -I. - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" - done -fi |