diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix index 6c1dd5f4a0a1..e77ce2d88eaa 100644 --- a/pkgs/applications/radio/sdr-j-fm/default.nix +++ b/pkgs/applications/radio/sdr-j-fm/default.nix @@ -6,7 +6,7 @@ wrapQtAppsHook, pkg-config, qtbase, - qwt, + qwt6_1, fftwFloat, libsamplerate, portaudio, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase - qwt + qwt6_1 fftwFloat libsamplerate portaudio diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 5c2c4cabc9f1..ae7681a7a3af 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , graphviz @@ -42,6 +43,14 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM="; }; + patches = [ + (fetchpatch { + name = "qwt-6.3-compile-error-fix.patch"; + url = "https://github.com/GPlates/GPlates/commit/c4680ebe54f4535909085feacecd66410a91ff98.patch"; + hash = "sha256-mw5+GLayMrmcSDd1ai+0JTuY3iedHT9u2kx5Dd2wMjg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 9a2a53587e48..dec84c1c4955 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qwt"; - version = "6.2.0"; + version = "6.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; - sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; + sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo="; }; propagatedBuildInputs = [ qtbase qtsvg qttools ];