diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-09-28 11:25:01 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2023-09-29 16:08:41 +0300 |
| commit | 7932ddf60441563e36aa0ae377537a515658f2a6 (patch) | |
| tree | 7af835c414f1751913fdb017d40dbd9daaa2b4cf /pkgs/applications/office/libreoffice | |
| parent | babd79315b4bb717c88b684b015d398fb3658eea (diff) | |
| download | nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.tar nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.tar.gz nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.tar.bz2 nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.tar.lz nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.tar.xz nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.tar.zst nixlib-7932ddf60441563e36aa0ae377537a515658f2a6.zip | |
libreoffice: always use stdenv.mkDerivation
`mkDerivation` from `libsForQt5` is deprecated. Hooks are preferred, see https://github.com/NixOS/nixpkgs/issues/180841 .
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a493eeeba3c3..9f72f193bf4a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -100,7 +100,7 @@ , langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false -, mkDerivation ? null +, wrapQtAppsHook ? null , qtbase ? null , qtx11extras ? null , qtwayland ? null @@ -152,8 +152,6 @@ let langsSpaces = concatStringsSep " " langs; - mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; - srcs = { primary = primary-src; third_party = @@ -186,7 +184,7 @@ let ]); }; -in mkDrv rec { +in stdenv.mkDerivation rec { pname = "libreoffice"; inherit version; @@ -508,6 +506,8 @@ in mkDrv rec { jdk17 libtool pkg-config + ] ++ optionals kdeIntegration [ + wrapQtAppsHook ]; buildInputs = with xorg; [ |