diff --git a/pkgs/tools/misc/btrfs-assistant/default.nix b/pkgs/tools/misc/btrfs-assistant/default.nix index 474a5e5dc5b4..ad9f835e2e96 100644 --- a/pkgs/tools/misc/btrfs-assistant/default.nix +++ b/pkgs/tools/misc/btrfs-assistant/default.nix @@ -7,24 +7,21 @@ , coreutils , git , pkg-config -, qtbase -, qtsvg -, qttools +, qt6 , snapper , util-linux -, wrapQtAppsHook , enableSnapper ? true }: stdenv.mkDerivation (finalAttrs: { pname = "btrfs-assistant"; - version = "1.9"; + version = "2.0"; src = fetchFromGitLab { owner = "btrfs-assistant"; repo = "btrfs-assistant"; rev = finalAttrs.version; - hash = "sha256-a854WI8f9/G/BRU5rn1FKC6WRZyXNYsUL4p258C8ppw="; + hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ="; }; nativeBuildInputs = [ @@ -35,12 +32,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ btrfs-progs - qtbase - qtsvg - qttools + qt6.qtbase + qt6.qtsvg + qt6.qttools + qt6.qtwayland ]; - propagatedBuildInputs = [ wrapQtAppsHook ]; + propagatedBuildInputs = [ qt6.wrapQtAppsHook ]; prePatch = '' substituteInPlace src/util/System.cpp \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfa74365675b..07dd3fc04fb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3559,7 +3559,7 @@ with pkgs; boulder = callPackage ../tools/admin/boulder { }; - btrfs-assistant = libsForQt5.callPackage ../tools/misc/btrfs-assistant { }; + btrfs-assistant = qt6.callPackage ../tools/misc/btrfs-assistant { }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };