diff --git a/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch b/pkgs/by-name/po/podman-desktop/extension-no-download-podman.patch similarity index 100% rename from pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch rename to pkgs/by-name/po/podman-desktop/extension-no-download-podman.patch diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/by-name/po/podman-desktop/package.nix similarity index 95% rename from pkgs/applications/virtualization/podman-desktop/default.nix rename to pkgs/by-name/po/podman-desktop/package.nix index b1e343aad5ab..6a8d20d75d76 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -3,14 +3,17 @@ , fetchFromGitHub , makeWrapper , copyDesktopItems -, electron +, electron_34 , nodejs , pnpm_9 , makeDesktopItem -, autoSignDarwinBinariesHook +, darwin , nix-update-script }: +let + electron = electron_34; +in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; version = "1.16.2"; @@ -31,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # podman should be installed with nix; disable auto-installation - ./patches/extension-no-download-podman.patch + ./extension-no-download-podman.patch ]; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -43,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a51c9f0a0da..6a31308d0e03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4686,11 +4686,6 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { }; - podman-desktop = callPackage ../applications/virtualization/podman-desktop { - inherit (darwin) autoSignDarwinBinariesHook; - electron = electron_34; - }; - polaris = callPackage ../servers/polaris { }; polaris-web = callPackage ../servers/polaris/web.nix { };