diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 37948bc4807a..9b492e9f9b69 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -16,13 +16,29 @@ gpart, hdparm, procps, - util-linuxMinimal, polkit, wrapGAppsHook3, replaceVars, mtools, - dosfstools, xhost, + dosfstools, + e2fsprogs, + util-linuxMinimal, + withAllTools ? false, + bcachefs-tools, + btrfs-progs, + exfatprogs, + f2fs-tools, + hfsprogs, + jfsutils, + cryptsetup, + lvm2, + nilfs-utils, + ntfs3g, + reiserfsprogs, + udftools, + xfsprogs, + xfsdump, }: stdenv.mkDerivation (finalAttrs: { @@ -65,6 +81,28 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; + runtimeDeps = [ + dosfstools + e2fsprogs + util-linuxMinimal + ] + ++ lib.optionals withAllTools [ + bcachefs-tools + btrfs-progs + exfatprogs + f2fs-tools + hfsprogs + jfsutils + cryptsetup + lvm2 + nilfs-utils + ntfs3g + reiserfsprogs + udftools + xfsprogs + xfsdump + ]; + preConfigure = '' # For ITS rules addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" @@ -73,18 +111,19 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${ - lib.makeBinPath [ - gpart - hdparm - util-linuxMinimal - procps - coreutils - gnused - gnugrep - mtools - dosfstools - xhost - ] + lib.makeBinPath ( + [ + gpart + hdparm + procps + coreutils + gnused + gnugrep + mtools + xhost + ] + ++ finalAttrs.runtimeDeps + ) }" ) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1acb30f79cd..f5c8e311f4ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2719,6 +2719,8 @@ with pkgs; google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; + gparted-full = gparted.override { withAllTools = true; }; + gdown = with python3Packages; toPythonApplication gdown; gpt4all-cuda = gpt4all.override {