public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93577 from danieldk/freeoffice-version

Browse Source 
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
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/office/softmaker/generic.nix
View File

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