diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 43fefc03b2a6..8e76815b5976 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -7,17 +7,18 @@ nix, nixos-install, coreutils, + xcp, testers, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE="; + hash = "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; @@ -26,17 +27,25 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/share/disko cp -r install-cli.nix cli.nix default.nix disk-deactivate lib $out/share/disko - for i in disko disko-install; do + scripts=(disko) + ${lib.optionalString (!stdenvNoCC.isDarwin) '' + scripts+=(disko-install) + ''} + + for i in "''${scripts[@]}"; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" wrapProgram "$out/bin/$i" \ --set DISKO_VERSION "${finalAttrs.version}" \ --prefix PATH : ${ - lib.makeBinPath [ - nix - coreutils - nixos-install - ] + lib.makeBinPath ( + [ + nix + coreutils + xcp + ] + ++ lib.optional (!stdenvNoCC.isDarwin) nixos-install + ) } done runHook postInstall @@ -45,7 +54,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck $out/bin/disko --help - $out/bin/disko-install --help + ${lib.optionalString (!stdenvNoCC.isDarwin) '' + $out/bin/disko-install --help + ''} runHook postInstallCheck ''; @@ -60,7 +71,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { mic92 lassulus iFreilicht + Enzime ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; })