diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2023-12-11 19:25:21 +0100 |
---|---|---|
committer | Maciej Krüger <mkg20001@gmail.com> | 2023-12-11 19:25:21 +0100 |
commit | f19386d03dba0993c5f175d2982abef8f32fd5ae (patch) | |
tree | 296a285bb38127a4d87b29a8e49d3550f33159e5 /pkgs/applications/radio/qlog | |
parent | a8dac2fa64af92360f126d2e20f47cd4ccf1c905 (diff) |
qlog: 0.29.2 -> 0.30.0
Diffstat (limited to 'pkgs/applications/radio/qlog')
-rw-r--r-- | pkgs/applications/radio/qlog/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/radio/qlog/mac.patch | 32 |
2 files changed, 2 insertions, 38 deletions
diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 5a790a12cdae8..9c43d40681f00 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,22 +16,18 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.29.2"; + version = "0.30.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-g7WgFQPMOaD+3YllZqpykslmPYT/jNVK7/1xaPdbti4="; + hash = "sha256-WgLUIWggUKHPjVa6brkJzeRMZli/qhfu4jatf+JYIRU="; fetchSubmodules = true; }; env.NIX_LDFLAGS = "-lhamlib"; - patches = [ - ./mac.patch - ]; - buildInputs = [ qtbase qtcharts diff --git a/pkgs/applications/radio/qlog/mac.patch b/pkgs/applications/radio/qlog/mac.patch deleted file mode 100644 index 661d508ab4e58..0000000000000 --- a/pkgs/applications/radio/qlog/mac.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2b0ed30806b34315962da382cb41edf5f19b231e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> -Date: Sat, 25 Nov 2023 14:22:24 +0100 -Subject: [PATCH] Add installation to PREFIX on mac when set - -This allows the app to be shipped in a non-bundeled version - -We need this to ship the app on macOS with nix ---- - QLog.pro | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/QLog.pro b/QLog.pro -index db6686f..576bfe1 100644 ---- a/QLog.pro -+++ b/QLog.pro -@@ -386,6 +386,12 @@ macx: { - equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain - equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain - DISTFILES += -+ -+ # This allows the app to be shipped in a non-bundeled version -+ !isEmpty(PREFIX) { -+ target.path = $$PREFIX -+ INSTALLS += target -+ } - } - - win32: { --- -2.42.0 - |