From 5156f07c960c42957c9c179f7b810a8d2fa8f4d8 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 26 Oct 2021 19:58:57 -0600 Subject: [PATCH] pocket-casts: set electron version on top-level --- pkgs/applications/audio/pocket-casts/default.nix | 15 ++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index ab55287f29f3..46625253d0f6 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,11 +1,7 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, -alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: -let - # Using Electron 12 to solve errors regarding threading - electron = electron_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "pocket-casts"; version = "0.5.0"; @@ -41,8 +37,9 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/share/applications/pocket-casts.desktop --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts - substituteInPlace $out/share/applications/pocket-casts.desktop --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" + substituteInPlace $out/share/applications/pocket-casts.desktop \ + --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts \ + --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" makeWrapper ${electron}/bin/electron \ $out/bin/pocket-casts \ --add-flags $out/opt/pocket-casts/resources/app.asar diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfe7a41c4b7e..99238fbd39c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3404,7 +3404,9 @@ with pkgs; pn = callPackage ../tools/text/pn { }; - pocket-casts = callPackage ../applications/audio/pocket-casts { }; + pocket-casts = callPackage ../applications/audio/pocket-casts { + electron = electron_12; + }; poweralertd = callPackage ../tools/misc/poweralertd { };