diff options
| author | Kranium Gikos Mendoza <kranium@gikos.net> | 2016-07-16 23:39:03 +0800 |
|---|---|---|
| committer | Kranium Gikos Mendoza <kranium@gikos.net> | 2016-07-16 23:39:03 +0800 |
| commit | 5d8005b1ef65129d5e4b571ac372f4d9ada1b4e9 (patch) | |
| tree | 3e07aa80cfbcc5e757a609c067b27180ede6c220 /pkgs/development/libraries/qt-3 | |
| parent | f76a8fbbac1af6d2a8fc13b8038e996d9c80fda8 (diff) | |
qt3: fix build after multiple-outputs change
also updated source tarball path
Diffstat (limited to 'pkgs/development/libraries/qt-3')
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 40fa63d75caf..3b6d2a3cc699 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2; + url = http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; }; @@ -39,14 +39,14 @@ stdenv.mkDerivation { -I${xextproto}/include ${if openglSupport then "-dlopen-opengl -L${mesa}/lib -I${mesa}/include - -L${libXmu}/lib -I${libXmu}/include" else ""} + -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} ${if threadSupport then "-thread" else "-no-thread"} - ${if xrenderSupport then "-xrender -L${libXrender}/lib -I${libXrender}/include" else "-no-xrender"} + ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} ${if xrandrSupport then "-xrandr - -L${libXrandr}/lib -I${libXrandr}/include + -L${libXrandr.out}/lib -I${libXrandr.dev}/include -I${randrproto}/include" else "-no-xrandr"} - ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"} - ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} + ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} + ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include |