diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix deleted file mode 100644 index 309ca8bf0f6a..000000000000 --- a/pkgs/applications/radio/qlog/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - fetchFromGitHub, - qtbase, - stdenv, - lib, - wrapQtAppsHook, - qmake, - qtcharts, - qtwebengine, - qtserialport, - qtwebchannel, - hamlib, - qtkeychain, - pkg-config, - cups, -}: - -stdenv.mkDerivation rec { - pname = "qlog"; - version = "0.43.0"; - - src = fetchFromGitHub { - owner = "foldynl"; - repo = "QLog"; - rev = "v${version}"; - hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc="; - fetchSubmodules = true; - }; - - env.NIX_LDFLAGS = "-lhamlib"; - - buildInputs = - [ - qtbase - qtcharts - qtwebengine - qtserialport - qtwebchannel - hamlib - qtkeychain - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - cups - ]); - - nativeBuildInputs = [ - wrapQtAppsHook - qmake - pkg-config - ]; - - meta = with lib; { - description = "Amateur radio logbook software"; - mainProgram = "qlog"; - license = with licenses; [ gpl3Only ]; - homepage = "https://github.com/foldynl/QLog"; - maintainers = with maintainers; [ - oliver-koss - mkg20001 - ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix new file mode 100644 index 000000000000..b6aef313ad21 --- /dev/null +++ b/pkgs/by-name/ql/qlog/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + stdenv, + lib, + cups, + hamlib, + pkg-config, + qt6, + qt6Packages, +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + tag = "v${version}"; + hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = + [ + hamlib + qt6.qtbase + qt6.qtcharts + qt6.qtserialport + qt6.qtwebchannel + qt6.qtwebengine + qt6Packages.qtkeychain + ] + ++ (lib.optionals stdenv.hostPlatform.isDarwin [ + cups + ]); + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/{qlog.app,Applications} + ln -s $out/Applications/qlog.app/Contents/MacOS/qlog $out/bin/qlog + ''; + + meta = { + description = "Amateur radio logbook software"; + mainProgram = "qlog"; + license = with lib.licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with lib.maintainers; [ + oliver-koss + mkg20001 + ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31b2b77af70c..246b7121d3bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4973,8 +4973,6 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - qlog = qt6Packages.callPackage ../applications/radio/qlog { }; - quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { };