diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-12-06 12:04:09 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-12-06 12:04:09 +0000 |
commit | eeda98a67388b55915f08f758755f4c5b3d518eb (patch) | |
tree | 9fc2ff700570bd4130524d88f074efc0e1b7fde8 | |
parent | f26b2678588b28d37d43526bd048b58d7446db2c (diff) | |
download | nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.tar nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.tar.gz nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.tar.bz2 nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.tar.lz nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.tar.xz nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.tar.zst nixpkgs-eeda98a67388b55915f08f758755f4c5b3d518eb.zip |
Remove qt-4.5
svn path=/nixpkgs/trunk/; revision=24991
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.5/default.nix | 86 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 0 insertions, 99 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix deleted file mode 100644 index 3b29043aeeb..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.5/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, buildDemos ? false, buildExamples ? false, keepDocumentation ? false}: - -stdenv.mkDerivation { - name = "qt-4.5.3"; - - src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.3.tar.gz; - sha256 = "19ls11m5skcjfgrfcidwqdm72kl7qrbj4hdl1nbmcdaxh91gr1qc"; - }; - - setupHook = ./setup-hook.sh; - - propagatedBuildInputs = [ - libXft - libXrender - libXrandr - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - # 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 - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - ${if buildDemos == true then "" else "-nomake demos"} - ${if buildExamples == true then "" else "-nomake examples"} - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - # Remove the documentation: it takes up >= 130 MB, which is more - # than half of the installed size. Ideally we should put this in a - # separate package (as well as the Qt Designer). - postInstall = '' - ${if keepDocumentation == false then "rm -rf $out/doc" else ""} - ''; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh deleted file mode 100644 index f9ecacbbb7d..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.5/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e878bf2bd9d..1d75a5c4adc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3780,10 +3780,6 @@ let qt4 = pkgs.kde4.qt4; - qt45 = callPackage ../development/libraries/qt-4.x/4.5 { - inherit (gnome) glib; - }; - qt46 = callPackage ../development/libraries/qt-4.x/4.6 { inherit (gnome) glib; }; |