tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
libsForQt5.qwt: 6.1.6 -> 6.2.0
Will Cohen
3 years ago
f405c598
45134bb9
+12
-12
5 changed files
expand all
collapse all
unified
split
pkgs
applications
networking
linssid
default.nix
radio
pothos
default.nix
science
electronics
caneda
default.nix
development
libraries
qwt
6.nix
tools
audio
opl3bankeditor
common.nix
+3
-3
pkgs/applications/networking/linssid/default.nix
···
1
1
-
{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
1
1
+
{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt6_1, wrapQtAppsHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "linssid";
···
10
10
};
11
11
12
12
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
13
13
-
buildInputs = [ qtbase qtsvg boost qwt ];
13
13
+
buildInputs = [ qtbase qtsvg boost qwt6_1 ];
14
14
15
15
patches = [ ./0001-unbundled-qwt.patch ];
16
16
17
17
postPatch = ''
18
18
-
sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro
18
18
+
sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro
19
19
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
20
20
sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
21
21
-e "s|/usr|$out|g" \
+2
-2
pkgs/applications/radio/pothos/default.nix
···
9
9
, poco
10
10
, qtbase
11
11
, qtsvg
12
12
-
, libsForQt5
12
12
+
, qwt6_1
13
13
, nlohmann_json
14
14
, soapysdr-with-plugins
15
15
, portaudio
···
38
38
nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
39
39
40
40
buildInputs = [
41
41
-
pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json
41
41
+
pcre poco qtbase qtsvg qwt6_1 nlohmann_json
42
42
soapysdr-with-plugins portaudio alsa-lib muparserx python3
43
43
];
44
44
+2
-2
pkgs/applications/science/electronics/caneda/default.nix
···
1
1
-
{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
1
1
+
{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt6_1}:
2
2
3
3
mkDerivation rec {
4
4
pname = "caneda";
···
12
12
};
13
13
14
14
nativeBuildInputs = [ cmake ];
15
15
-
buildInputs = [ qtbase qttools qtsvg qwt ];
15
15
+
buildInputs = [ qtbase qttools qtsvg qwt6_1 ];
16
16
17
17
meta = {
18
18
description = "Open source EDA software focused on easy of use and portability";
+2
-2
pkgs/development/libraries/qwt/6.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "qwt";
5
5
-
version = "6.1.6";
5
5
+
version = "6.2.0";
6
6
7
7
src = fetchurl {
8
8
url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
9
9
-
sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=";
9
9
+
sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=";
10
10
};
11
11
12
12
propagatedBuildInputs = [ qtbase qtsvg qttools ];
+3
-3
pkgs/tools/audio/opl3bankeditor/common.nix
···
9
9
, pkg-config
10
10
, qttools
11
11
, qtbase
12
12
-
, qwt
12
12
+
, qwt6_1
13
13
, rtaudio
14
14
, rtmidi
15
15
}:
···
43
43
44
44
buildInputs = [
45
45
qtbase
46
46
-
qwt
46
46
+
qwt6_1
47
47
rtaudio
48
48
rtmidi
49
49
];
···
52
52
mkdir $out/{bin,Applications}
53
53
mv "${binname}.app" $out/Applications/
54
54
55
55
-
install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}"
55
55
+
install_name_tool -change {,${qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}"
56
56
57
57
ln -s "$out/Applications/${binname}.app/Contents/MacOS/${binname}" $out/bin/${mainProgram}
58
58
'';