diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index a3fee9a114de..b92a994bd701 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { inherit pname src; - version = "${edition}.${version}"; + version = if edition != "" then "${edition}.${version}" else version; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/applications/office/softmaker/softmaker-office-nx.nix b/pkgs/applications/office/softmaker/softmaker-office-nx.nix new file mode 100644 index 000000000000..f6b152df6883 --- /dev/null +++ b/pkgs/applications/office/softmaker/softmaker-office-nx.nix @@ -0,0 +1,32 @@ +{ + 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"; + } +) diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker-office.nix similarity index 100% rename from pkgs/applications/office/softmaker/softmaker_office.nix rename to pkgs/applications/office/softmaker/softmaker-office.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 136e2e6d2dcb..f0de88d9b682 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13937,7 +13937,12 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; + 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;