alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libsForQt5.qwt: 6.1.6 -> 6.2.0

Browse source
This commit is contained in:
Will Cohen 2022-03-22 16:53:46 -04:00
parent 45134bb912
commit f405c59874
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/linssid/default.nix
View file

@ -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" \

4
pkgs/applications/radio/pothos/default.nix
View file

@ -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
];

4
pkgs/applications/science/electronics/caneda/default.nix
View file

@ -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";

4
pkgs/development/libraries/qwt/6.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "qwt";
version = "6.1.6";
version = "6.2.0";
src = fetchurl {
url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=";
sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=";
};
propagatedBuildInputs = [ qtbase qtsvg qttools ];

6
pkgs/tools/audio/opl3bankeditor/common.nix
View file

@ -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}
'';