public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: make qt-5.4.1 default

Browse Source
This commit is contained in:
Thomas Tuegel
2015-03-24 17:14:56 -05:00
parent ad49ea230a
commit 5d1f6ad57c
31 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/gnuplot/default.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ lib.optional withTeXLive texLive
++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optional withQt [ qt ]
++ lib.optional withQt [ qt.base ]
# compiling with wxGTK causes a malloc (double free) error on darwin
++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;
pkgs/tools/graphics/kst/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt5 gsl getdata netcdf muparser matio ];
buildInputs = [ qt5.base gsl getdata netcdf muparser matio ];
cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1";