alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #213972 from WolfangAukang/morgen-update

Browse source 
morgen: 2.5.16 -> 2.6.4, update electron version
This commit is contained in:
Weijia Wang 2023-02-01 19:57:21 +01:00 committed by GitHub
parent 9686512e43 637b3cc03a
commit 0b2cf91aad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/office/morgen/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "morgen";
version = "2.5.16";
version = "2.6.4";
src = fetchurl {
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24=";
sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY=";
};
nativeBuildInputs = [
@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
dontBuild = true;
dontConfigure = true;
unpackCmd = ''
dpkg-deb -x ${src} ./morgen-${pname}
'';
@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
# 2. Fixes startup script
substituteInPlace $TMP/work/dist/main.js \
--replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \
--replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen"
--replace "Exec=\".concat(process.execPath," "Exec=\".concat(\"$out/bin/morgen\","
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar
substituteInPlace $out/share/applications/morgen.desktop \

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

@ -9807,7 +9807,7 @@ with pkgs;
mole = callPackage ../tools/networking/mole { };
morgen = callPackage ../applications/office/morgen {
electron = electron_15;
electron = electron_22;
};
mosh = callPackage ../tools/networking/mosh { };