diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
| commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
| tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/qt-3/default.nix | |
| parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
| parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
| download | nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip | |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/qt-3/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 432b4358f7a..ffad4418815 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { -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 mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft}/lib -I${libXft}/include -L${libXft.freetype}/lib -I${libXft.freetype}/include |