Unverified Commit 6f990a0b authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

podman-desktop: 1.13.2 -> 1.16.2 (#379002)

parents 8ea022af 8bf44b3e

pkgs/applications/virtualization/podman-desktop/default.nix

+14 −24
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchFromGitHub

, makeWrapper

, copyDesktopItems

, electron_33

, electron

, nodejs

, pnpm_9

, makeDesktopItem
@@ -13,20 +13,20 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "podman-desktop";

  version = "1.13.2";

  version = "1.16.2";



  passthru.updateScript = nix-update-script { };



  src = fetchFromGitHub {

    owner = "containers";

    repo = "podman-desktop";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-Ekprt+cWuvJck+H1aexIdTDQosBdDsTLlkBgIgd77dk=";

  };



  pnpmDeps = pnpm_9.fetchDeps {

    inherit (finalAttrs) pname version src;

    hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA=";

    hash = "sha256-pChWWQ5YgekcEsXagv0lWTDNXGKK1EbOgdWF48Nn3Hs=";

  };



  patches = [
@@ -34,21 +34,14 @@ stdenv.mkDerivation (finalAttrs: { 
    ./patches/extension-no-download-podman.patch

  ];



  postPatch = ''

    for file in packages/main/src/tray-animate-icon.ts packages/main/src/plugin/certificates.ts; do

      substituteInPlace "$file" \

        --replace-fail 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'"

    done

    substituteInPlace "extensions/podman/packages/extension/src/util.ts" \

      --replace-fail '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'"

  '';



  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";



  nativeBuildInputs = [

    makeWrapper nodejs pnpm_9.configHook

    nodejs

    pnpm_9.configHook

  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

    copyDesktopItems

    makeWrapper

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    autoSignDarwinBinariesHook

  ];
@@ -56,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildPhase = ''

    runHook preBuild



    cp -r ${electron_33.dist} electron-dist

    cp -r ${electron.dist} electron-dist

    chmod -R u+w electron-dist



    pnpm build
@@ -64,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { 
      --dir \

      --config .electron-builder.config.cjs \

      -c.electronDist=electron-dist \

      -c.electronVersion=${electron_33.version}

      -c.electronVersion=${electron.version}



    runHook postBuild

  '';
@@ -72,19 +65,16 @@ stdenv.mkDerivation (finalAttrs: { 
  installPhase = ''

    runHook preInstall



    mkdir -p "$out/share/lib/podman-desktop"

  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''

    mkdir -p $out/{Applications,bin}

    mkdir -p $out/Applications

    mv dist/mac*/Podman\ Desktop.app $out/Applications

    ln -s $out/Applications/Podman\ Desktop.app/Contents/Resources "$out/share/lib/podman-desktop/resources"



    makeWrapper "$out/Applications/Podman Desktop.app/Contents/MacOS/Podman Desktop" $out/bin/podman-desktop

  '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

    mkdir -p "$out/share/lib/podman-desktop"

    cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop"



    install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg"



    makeWrapper '${electron_33}/bin/electron' "$out/bin/podman-desktop" \

    makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \

      --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

      --inherit-argv0
@@ -113,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { 
    changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ booxter panda2134 ];

    inherit (electron_33.meta) platforms;

    inherit (electron.meta) platforms;

    mainProgram = "podman-desktop";

  };

})

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -4683,6 +4683,7 @@ with pkgs; 














  podman-desktop = callPackage ../applications/virtualization/podman-desktop {















    inherit (darwin) autoSignDarwinBinariesHook;













    electron = electron_34;















  };





























  polaris = callPackage ../servers/polaris { };