pyrox.dev / nixpkgs
lol
fork atom

jami: move to by-name

linsui 8fb5f3a7 225cbfd4

+19 -30
unified split
+19 -24
pkgs/applications/networking/instant-messengers/jami/default.nix pkgs/by-name/ja/jami/package.nix
··· 17 17 gmp, 18 18 gnutls, 19 19 llhttp, 20 - jack, 21 20 jsoncpp, 22 21 libarchive, 23 22 libgit2, 23 + libjack2, 24 24 libnatpmp, 25 25 libpulseaudio, 26 26 libupnp, ··· 42 42 git, 43 43 networkmanager, # for libnm 44 44 python3, 45 - qttools, # for translations 46 - wrapQtAppsHook, 47 45 libnotify, 48 46 md4c, 49 47 html-tidy, 50 48 hunspell, 51 - qt5compat, 52 - qtbase, 53 - qtdeclarative, 54 49 qrencode, 55 - qtmultimedia, 56 - qtnetworkauth, 57 - qtpositioning, 58 - qtsvg, 59 - qtwebengine, 60 - qtwebchannel, 50 + qt6Packages, 61 51 wrapGAppsHook3, 62 52 zxing-cpp, 63 53 withWebengine ? true, ··· 210 200 gmp 211 201 gnutls 212 202 llhttp 213 - jack 203 + libjack2 214 204 jsoncpp 215 205 libarchive 216 206 libgit2 ··· 261 251 262 252 nativeBuildInputs = [ 263 253 wrapGAppsHook3 264 - wrapQtAppsHook 254 + qt6Packages.wrapQtAppsHook 265 255 pkg-config 266 256 cmake 267 257 git 268 258 python3 269 - qttools 259 + qt6Packages.qttools # for translations 270 260 ]; 271 261 272 262 buildInputs = [ ··· 276 266 libnotify 277 267 md4c 278 268 networkmanager 279 - qtbase 280 - qt5compat 281 269 qrencode 282 - qtnetworkauth 283 - qtdeclarative 284 - qtmultimedia 285 - qtpositioning 286 - qtsvg 287 - qtwebchannel 288 270 zxing-cpp 289 271 ] 290 - ++ lib.optionals withWebengine [ qtwebengine ]; 272 + ++ ( 273 + with qt6Packages; 274 + [ 275 + qtbase 276 + qt5compat 277 + qtnetworkauth 278 + qtdeclarative 279 + qtmultimedia 280 + qtpositioning 281 + qtsvg 282 + qtwebchannel 283 + ] 284 + ++ lib.optionals withWebengine [ qtwebengine ] 285 + ); 291 286 292 287 cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; 293 288
-6
pkgs/top-level/all-packages.nix
··· 16304 16304 16305 16305 sieveshell = with python3.pkgs; toPythonApplication managesieve; 16306 16306 16307 - jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { 16308 - # TODO: remove once `udev` is `systemdMinimal` everywhere. 16309 - udev = systemdMinimal; 16310 - jack = libjack2; 16311 - }; 16312 - 16313 16307 gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; 16314 16308 16315 16309 inherit (callPackage ../applications/misc/zettlr { }) zettlr;