podman-desktop: move to by-name (#388484)
This commit is contained in:
+7
-4
@@ -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 = ''
|
||||
@@ -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 { };
|
||||
|
||||
Reference in New Issue
Block a user