cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #143071 from WolfangAukang/pocket-casts-fix

Browse source 
pocket-casts: set electron version on top-level
This commit is contained in:
Bobby Rong 2021-11-01 22:56:50 +08:00 committed by GitHub
commit cd92b90301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/audio/pocket-casts/default.nix
View file

@ -1,11 +1,7 @@
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: , alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }:
let stdenv.mkDerivation rec {
# Using Electron 12 to solve errors regarding threading
electron = electron_12;
in stdenv.mkDerivation rec {
pname = "pocket-casts"; pname = "pocket-casts";
version = "0.5.0"; version = "0.5.0";
@ -41,8 +37,9 @@ in stdenv.mkDerivation rec {
''; '';
postFixup = '' 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 \
substituteInPlace $out/share/applications/pocket-casts.desktop --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" --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 \ makeWrapper ${electron}/bin/electron \
$out/bin/pocket-casts \ $out/bin/pocket-casts \
--add-flags $out/opt/pocket-casts/resources/app.asar --add-flags $out/opt/pocket-casts/resources/app.asar

4
pkgs/top-level/all-packages.nix
View file

@ -3410,7 +3410,9 @@ with pkgs;
pn = callPackage ../tools/text/pn { }; 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 { }; poweralertd = callPackage ../tools/misc/poweralertd { };