diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix index 7c431a6a6ea1..bf70e26d3a54 100644 --- a/pkgs/by-name/sp/spnavcfg/package.nix +++ b/pkgs/by-name/sp/spnavcfg/package.nix @@ -1,51 +1,45 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, - fetchpatch, pkg-config, libspnav, - libX11, - - # Qt6 support is close: https://github.com/FreeSpacenav/spnavcfg/issues/43 - libsForQt5, + qt6, }: + stdenv.mkDerivation (finalAttrs: { pname = "spnavcfg"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "FreeSpacenav"; repo = "spnavcfg"; tag = "v${finalAttrs.version}"; fetchLFS = true; - hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA="; + hash = "sha256-HYBb1/SgjayJjdA0N8UHPde3y4SugYiWIPP+3Eu3CEI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/FreeSpacenav/spnavcfg/commit/fd9aa10fb8e19a257398757943b3d8e79906e583.patch"; - hash = "sha256-XKEyLAFrA4qRU3zkBozblb/fKtLKsaItze0xv1uLnq0="; - }) - ]; - nativeBuildInputs = [ pkg-config - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - libsForQt5.qtbase + qt6.qtbase libspnav - libX11 ]; - meta = with lib; { + configureFlags = [ + "--qt6" + "--qt-tooldir=${qt6.qtbase}/libexec" + ]; + + meta = { homepage = "https://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; mainProgram = "spnavcfg"; }; })