Unverified Commit 8480747d authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

softmaker-office-nx: init at 1222 (#366490)

parents 8fd29574 603f344a

pkgs/applications/office/softmaker/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ in 
stdenv.mkDerivation {

  inherit pname src;



  version = "${edition}.${version}";

  version = if edition != "" then "${edition}.${version}" else version;



  nativeBuildInputs = [

    autoPatchelfHook

pkgs/applications/office/softmaker/softmaker-office-nx.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{

  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 = "1222";

    edition = "";

    hash = "sha256-8ya9RYpd9G5SITYOpvhxjQE8ieV8TuAApkjNwCf9nHs=";

  },



  ...

}@args:



callPackage ./generic.nix (

  args

  // rec {

    inherit (officeVersion) version edition;



    pname = "softmaker-office-nx";

    suiteName = "SoftMaker Office NX";



    src = fetchurl {

      inherit (officeVersion) hash;

      url = "https://www.softmaker.net/down/softmaker-office-nx-${version}-amd64.tgz";

    };



    archive = "officenx.tar.lzma";

  }

)

pkgs/top-level/all-packages.nix

+15 −2
Original line number Diff line number Diff line
@@ -13937,7 +13937,12 @@ with pkgs; 
    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

  };













  inherit













    ({















      freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };













    })













    freeoffice













    ;





























  inherit (xorg) xlsfonts;
























@@ -14950,7 +14955,15 @@ with pkgs;



























  smtube = libsForQt5.callPackage ../applications/video/smtube { };



























  softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { };













  inherit













    ({













      softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { };













      softmaker-office-nx = callPackage ../applications/office/softmaker/softmaker-office-nx.nix { };













    })













    softmaker-office













    softmaker-office-nx













    ;









































  synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {















    inherit (darwin.apple_sdk.frameworks) CoreServices Security;