diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-09-28 11:28:55 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2023-09-29 16:08:41 +0300 |
| commit | 27b1afd0063b5f619c02183127b7e5e2c985cd31 (patch) | |
| tree | bbec0d717926563f2d19666f552c28e8b621c545 /pkgs/applications/office/libreoffice | |
| parent | 7932ddf60441563e36aa0ae377537a515658f2a6 (diff) | |
libreoffice: use finalAttrs in mkDerivation
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 9f72f193bf4a5..c56218a7d365c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -183,8 +183,9 @@ let kwindowsystem ]); }; + tarballPath = "external/tarballs"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; @@ -197,8 +198,6 @@ in stdenv.mkDerivation rec { "-O2" # https://bugs.gentoo.org/727188 ]); - tarballPath = "external/tarballs"; - postUnpack = '' mkdir -v $sourceRoot/${tarballPath} '' + (flip concatMapStrings srcs.third_party (f: '' @@ -233,7 +232,7 @@ in stdenv.mkDerivation rec { disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) - buildInputs); + finalAttrs.buildInputs); ### QT/KDE # @@ -600,7 +599,7 @@ in stdenv.mkDerivation rec { zip zlib ] - ++ passthru.gst_packages + ++ finalAttrs.passthru.gst_packages ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; @@ -663,4 +662,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -} +}) |