pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #175380 from klemensn/partition-manager-fix-wrap

partitionmanager: Wrap once

authored by

Artturi and committed by
GitHub daeda028 7848e731

+8 -5
+8 -5
pkgs/tools/misc/partition-manager/default.nix
··· 1 - { mkDerivation, fetchurl, lib, makeWrapper 2 - , extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook 1 + { mkDerivation, fetchurl, lib 2 + , extra-cmake-modules, kdoctools, wrapGAppsHook 3 3 , kconfig, kcrash, kinit, kpmcore, polkit-qt 4 4 , cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux 5 5 , btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs ··· 48 48 hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo="; 49 49 }; 50 50 51 - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ]; 51 + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; 52 52 53 53 propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ]; 54 54 55 - postFixup = '' 56 - wrapProgram $out/bin/partitionmanager \ 55 + dontWrapGApps = true; 56 + preFixup = '' 57 + qtWrapperArgs+=( 58 + "''${gappsWrapperArgs[@]}" 57 59 --prefix PATH : "${runtimeDeps}" 60 + ) 58 61 ''; 59 62 60 63 meta = with lib; {