MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move qt-4.x into subfolder

Browse source 
svn path=/nixpkgs/trunk/; revision=21658
This commit is contained in:
Yury G. Kudryashov 2010-05-07 20:08:31 +00:00
parent 5564bd2635
commit 0864c1422e
5 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/development/libraries/qt-4.5/default.nix → pkgs/development/libraries/qt-4.x/4.5/default.nix
View file

0
pkgs/development/libraries/qt-4.5/setup-hook.sh → pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh
View file

0
pkgs/development/libraries/qt-4.6/default.nix → pkgs/development/libraries/qt-4.x/4.6/default.nix
View file

0
pkgs/development/libraries/qt-4.6/setup-hook.sh → pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh
View file

4
pkgs/top-level/all-packages.nix
View file

@ -5022,7 +5022,7 @@ let
qt4 = qt46; qt4 = qt46;
qt45 = import ../development/libraries/qt-4.5 { qt45 = import ../development/libraries/qt-4.x/4.5 {
inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff; fontconfig freetype pkgconfig libtiff;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
@ -5031,7 +5031,7 @@ let
inherit (gnome) glib; inherit (gnome) glib;
}; };
qt46 = makeOverridable (import ../development/libraries/qt-4.6) { qt46 = makeOverridable (import ../development/libraries/qt-4.x/4.6) {
inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib
postgresql; postgresql;