Merge pull request #93577 from danieldk/freeoffice-version

softmaker-office, freeoffice: change version to edition.version
This commit is contained in:
Daniël de Kok 2020-07-24 12:25:11 +02:00 committed by GitHub
commit 8b0221cbe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,8 +17,11 @@ let
inherit makeDesktopItem pname suiteName;
};
shortEdition = builtins.substring 2 2 edition;
in stdenv.mkDerivation rec {
inherit pname version edition shortEdition src;
in stdenv.mkDerivation {
inherit pname src;
version = "${edition}.${version}";
nativeBuildInputs = [
autoPatchelfHook
makeWrapper