mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
btrfs-assistant: 1.9 -> 2.0
This commit is contained in:
parent
2d96747851
commit
f60032a9ac
|
@ -7,24 +7,21 @@
|
||||||
, coreutils
|
, coreutils
|
||||||
, git
|
, git
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, qtbase
|
, qt6
|
||||||
, qtsvg
|
|
||||||
, qttools
|
|
||||||
, snapper
|
, snapper
|
||||||
, util-linux
|
, util-linux
|
||||||
, wrapQtAppsHook
|
|
||||||
, enableSnapper ? true
|
, enableSnapper ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "btrfs-assistant";
|
pname = "btrfs-assistant";
|
||||||
version = "1.9";
|
version = "2.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "btrfs-assistant";
|
owner = "btrfs-assistant";
|
||||||
repo = "btrfs-assistant";
|
repo = "btrfs-assistant";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-a854WI8f9/G/BRU5rn1FKC6WRZyXNYsUL4p258C8ppw=";
|
hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -35,12 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
btrfs-progs
|
btrfs-progs
|
||||||
qtbase
|
qt6.qtbase
|
||||||
qtsvg
|
qt6.qtsvg
|
||||||
qttools
|
qt6.qttools
|
||||||
|
qt6.qtwayland
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ wrapQtAppsHook ];
|
propagatedBuildInputs = [ qt6.wrapQtAppsHook ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
substituteInPlace src/util/System.cpp \
|
substituteInPlace src/util/System.cpp \
|
||||||
|
|
|
@ -3559,7 +3559,7 @@ with pkgs;
|
||||||
|
|
||||||
boulder = callPackage ../tools/admin/boulder { };
|
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 { };
|
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue