diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 090f53cffb62..72128a5ef95c 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt6_1, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg boost qwt ]; + buildInputs = [ qtbase qtsvg boost qwt6_1 ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' - sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro + sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 817013dbf3ec..1b36b36829a0 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -9,7 +9,7 @@ , poco , qtbase , qtsvg -, libsForQt5 +, qwt6_1 , nlohmann_json , soapysdr-with-plugins , portaudio @@ -38,7 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ]; buildInputs = [ - pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json + pcre poco qtbase qtsvg qwt6_1 nlohmann_json soapysdr-with-plugins portaudio alsa-lib muparserx python3 ]; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 6a9a491af1ee..1adac4832a13 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt6_1}: mkDerivation rec { pname = "caneda"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools qtsvg qwt ]; + buildInputs = [ qtbase qttools qtsvg qwt6_1 ]; meta = { description = "Open source EDA software focused on easy of use and portability"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6_1.nix similarity index 94% rename from pkgs/development/libraries/qwt/6.nix rename to pkgs/development/libraries/qwt/6_1.nix index a9fa29ba4d4f..4e3a179e7520 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6_1.nix @@ -24,9 +24,8 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; + license = licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; - branch = "6"; }; } diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index a5dcfedb8491..46cfc426efa4 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { pname = "qwt"; - version = "5.2.3"; + version = "6.2.0"; src = fetchurl { - url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2"; - sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip"; + url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; + sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; }; - propagatedBuildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmake ]; postPatch = '' - sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro - sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri + sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}" - ''; + qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; + + dontWrapQtApps = true; meta = with lib; { description = "Qt widgets for technical applications"; diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix index 04f4d3aae5ab..982b8f8349f3 100644 --- a/pkgs/tools/audio/opl3bankeditor/common.nix +++ b/pkgs/tools/audio/opl3bankeditor/common.nix @@ -9,7 +9,7 @@ , pkg-config , qttools , qtbase -, qwt +, qwt6_1 , rtaudio , rtmidi }: @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase - qwt + qwt6_1 rtaudio rtmidi ]; @@ -52,7 +52,7 @@ mkDerivation rec { mkdir $out/{bin,Applications} mv "${binname}.app" $out/Applications/ - install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}" + install_name_tool -change {,${qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}" ln -s "$out/Applications/${binname}.app/Contents/MacOS/${binname}" $out/bin/${mainProgram} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceea8098e648..7889ac2919f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19943,8 +19943,6 @@ with pkgs; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; - qwt = callPackage ../development/libraries/qwt {}; - qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { inherit (darwin.apple_sdk.frameworks) AGL; }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index bab473bd8a0c..4b00b704d5fb 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -210,7 +210,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea quazip = callPackage ../development/libraries/quazip { }; - qwt = callPackage ../development/libraries/qwt/6.nix { }; + qwt = callPackage ../development/libraries/qwt/default.nix { }; + + qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; soqt = callPackage ../development/libraries/soqt { };