gnuplot_qt: Qt 4 -> Qt 5

+16 -10
+15 -9
pkgs/tools/graphics/gnuplot/default.nix
··· 12 12 , fontconfig ? null 13 13 , gnused ? null 14 14 , coreutils ? null 15 - , withQt ? false, qt }: 15 + , withQt ? false, qttools, qtbase, qtsvg 16 + }: 16 17 17 18 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); 18 19 let ··· 26 27 sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"; 27 28 }; 28 29 29 - nativeBuildInputs = [ makeWrapper pkgconfig texinfo ]; 30 + nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; 30 31 31 32 buildInputs = 32 33 [ cairo gd libcerf pango readline zlib ] 33 34 ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) 34 35 ++ lib.optional withLua lua 35 36 ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] 36 - ++ lib.optional withQt qt 37 - # compiling with wxGTK causes a malloc (double free) error on darwin 38 - ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; 37 + ++ lib.optionals withQt [ qtbase qtsvg ] 38 + ++ lib.optional withWxGTK wxGTK; 39 39 40 - configureFlags = 41 - (if withX then ["--with-x"] else ["--without-x"]) 42 - ++ (if withQt then ["--enable-qt"] else ["--disable-qt"]) 43 - ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]); 40 + postPatch = '' 41 + # lrelease is in qttools, not in qtbase. 42 + substituteInPlace configure --replace '$'{QT5LOC}/lrelease lrelease 43 + ''; 44 + 45 + configureFlags = [ 46 + (if withX then "--with-x" else "--without-x") 47 + (if withQt then "--with-qt=qt5" else "--without-qt") 48 + (if aquaterm then "--with-aquaterm" else "--without-aquaterm") 49 + ]; 44 50 45 51 postInstall = lib.optionalString withX '' 46 52 wrapProgram $out/bin/gnuplot \
+1 -1
pkgs/top-level/all-packages.nix
··· 2342 2342 }; 2343 2343 gnupg = gnupg22; 2344 2344 2345 - gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; 2345 + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; 2346 2346 2347 2347 gnuplot_qt = gnuplot.override { withQt = true; }; 2348 2348