Unverified Commit 5b68fa0d authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

freeoffice: 2021.1054 -> 2024.1220; softmaker-office: 2021.1032 -> 2024.1222 (#366478)

parents c6e048dd 53953bbd

pkgs/applications/office/softmaker/desktop_items.nix

+5 −1
Original line number Diff line number Diff line 
{ makeDesktopItem, pname, suiteName }:

{

  makeDesktopItem,

  pname,

  suiteName,

}:



{

  planmaker = makeDesktopItem {

pkgs/applications/office/softmaker/freeoffice.nix

+23 −18
Original line number Diff line number Diff line 
{ callPackage

, fetchurl

{

  callPackage,

  fetchurl,



  # This is a bit unusual, but makes version and hash easily

  # overridable. This is useful when the upstream archive was replaced

  # and nixpkgs is not in sync yet.

, officeVersion ? {

  version = "1054";

  edition = "2021";

  hash = "sha256-dqmJUm0Qi1/GzGrI4OCHo1LwQ5KxMwZZw5EsYTMF6XU=";

}

  officeVersion ? {

    version = "1220";

    edition = "2024";

    hash = "sha256-F1Srm3/4UPifYls21MhjbpxSyLaT0gEVzEMQF0gIzi0=";

  },



, ... } @ args:

  ...

}@args:



callPackage ./generic.nix (args // rec {

callPackage ./generic.nix (

  args

  // rec {

    inherit (officeVersion) version edition;



    pname = "freeoffice";
@@ -24,4 +28,5 @@ callPackage ./generic.nix (args // rec { 
    };



    archive = "freeoffice${edition}.tar.lzma";

})
 
  }

)

pkgs/applications/office/softmaker/generic.nix

+100 −65
Original line number Diff line number Diff line 
{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems

{

  lib,

  stdenv,

  autoPatchelfHook,

  makeDesktopItem,

  makeWrapper,

  copyDesktopItems,



  # Dynamic Libraries

, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender

  curl,

  glib,

  gst_all_1,

  libGL,

  libX11,

  libXext,

  libXmu,

  libXrandr,

  libXrender,



  # For fixing up execution of /bin/ls, which is necessary for

  # product unlocking.

, coreutils, libredirect

  coreutils,

  libredirect,



  # Extra utilities used by the SoftMaker applications.

, gnugrep, util-linux, which



, pname, version, edition, suiteName, src, archive



, ...

  gnugrep,

  util-linux,

  which,



  pname,

  version,

  edition,

  suiteName,

  src,

  archive,



  ...

}:



let
@@ -20,7 +42,8 @@ let 
    inherit makeDesktopItem pname suiteName;

  };

  shortEdition = builtins.substring 2 2 edition;

in stdenv.mkDerivation {

in

stdenv.mkDerivation {

  inherit pname src;



  version = "${edition}.${version}";
@@ -33,6 +56,9 @@ in stdenv.mkDerivation { 


  buildInputs = [

    curl

    glib

    gst_all_1.gstreamer

    gst_all_1.gst-plugins-base

    libGL

    libX11

    libXext
@@ -56,7 +82,8 @@ in stdenv.mkDerivation { 
    runHook postUnpack

  '';



  installPhase = let

  installPhase =

    let

      # SoftMaker/FreeOffice collects some system information upon

      # unlocking the product. But in doing so, it attempts to execute

      # /bin/ls. If the execve syscall fails, the whole unlock
@@ -73,9 +100,17 @@ in stdenv.mkDerivation { 
      extraWrapperArgs = ''

        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \

        --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \

      --prefix PATH : "${lib.makeBinPath [ coreutils gnugrep util-linux which ]}"

        --prefix PATH : "${

          lib.makeBinPath [

            coreutils

            gnugrep

            util-linux

            which

          ]

        }"

      '';

  in ''

    in

    ''

      runHook preInstall



      mkdir -p $out/share

pkgs/applications/office/softmaker/softmaker_office.nix

+23 −18
Original line number Diff line number Diff line 
{ callPackage

, fetchurl

{

  callPackage,

  fetchurl,



  # This is a bit unusual, but makes version and hash easily

  # overridable. This is useful when people have an older version of

  # Softmaker Office or when the upstream archive was replaced and

  # nixpkgs is not in sync yet.

, officeVersion ? {

  version = "1032";

  edition = "2021";

  hash = "sha256-LchSqLVBdkmWJQ8hCEvtwRPgIUSDE0URKPzCkEexGbc=";

}

  officeVersion ? {

    version = "1222";

    edition = "2024";

    hash = "sha256-eyYBK5ZxPcBakOvXUQZIU2aftyH6PXh/rtqC/1BJhg4=";

  },



, ... } @ args:

  ...

}@args:



callPackage ./generic.nix (args // rec {

callPackage ./generic.nix (

  args

  // rec {

    inherit (officeVersion) version edition;



    pname = "softmaker-office";
@@ -25,4 +29,5 @@ callPackage ./generic.nix (args // rec { 
    };



    archive = "office${edition}.tar.lzma";

})
 
  }

)