pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #213972 from WolfangAukang/morgen-update

morgen: 2.5.16 -> 2.6.4, update electron version

authored by Weijia Wang and committed by GitHub 0b2cf91a 9686512e

+4 -7
unified split
+3 -6
pkgs/applications/office/morgen/default.nix
··· 3 4 stdenv.mkDerivation rec { 5 pname = "morgen"; 6 - version = "2.5.16"; 7 8 src = fetchurl { 9 url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; 10 - sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24="; 11 }; 12 13 nativeBuildInputs = [ ··· 19 20 buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; 21 22 - dontBuild = true; 23 - dontConfigure = true; 24 - 25 unpackCmd = '' 26 dpkg-deb -x ${src} ./morgen-${pname} 27 ''; ··· 37 # 2. Fixes startup script 38 substituteInPlace $TMP/work/dist/main.js \ 39 --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ 40 - --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen" 41 asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar 42 43 substituteInPlace $out/share/applications/morgen.desktop \
··· 3 4 stdenv.mkDerivation rec { 5 pname = "morgen"; 6 + version = "2.6.4"; 7 8 src = fetchurl { 9 url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; 10 + sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY="; 11 }; 12 13 nativeBuildInputs = [ ··· 19 20 buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; 21 22 unpackCmd = '' 23 dpkg-deb -x ${src} ./morgen-${pname} 24 ''; ··· 34 # 2. Fixes startup script 35 substituteInPlace $TMP/work/dist/main.js \ 36 --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ 37 + --replace "Exec=\".concat(process.execPath," "Exec=\".concat(\"$out/bin/morgen\"," 38 asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar 39 40 substituteInPlace $out/share/applications/morgen.desktop \
+1 -1
pkgs/top-level/all-packages.nix
··· 9807 mole = callPackage ../tools/networking/mole { }; 9808 9809 morgen = callPackage ../applications/office/morgen { 9810 - electron = electron_15; 9811 }; 9812 9813 mosh = callPackage ../tools/networking/mosh { };
··· 9807 mole = callPackage ../tools/networking/mole { }; 9808 9809 morgen = callPackage ../applications/office/morgen { 9810 + electron = electron_22; 9811 }; 9812 9813 mosh = callPackage ../tools/networking/mosh { };