pyrox.dev / nixpkgs
lol
fork atom

jami: build with system zxing-cpp (#431474)

authored by

Nick Cao and committed by
GitHub be7ffb6c 9b6c6285

+29 -30
unified split
+29 -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 - qt5compat, 49 - qtbase, 50 - qtdeclarative, 46 + md4c, 47 + html-tidy, 48 + hunspell, 51 49 qrencode, 52 - qtmultimedia, 53 - qtnetworkauth, 54 - qtpositioning, 55 - qtsvg, 56 - qtwebengine, 57 - qtwebchannel, 50 + qt6Packages, 58 51 wrapGAppsHook3, 52 + zxing-cpp, 59 53 withWebengine ? true, 60 54 61 55 # for pjsip ··· 206 200 gmp 207 201 gnutls 208 202 llhttp 209 - jack 203 + libjack2 210 204 jsoncpp 211 205 libarchive 212 206 libgit2 ··· 241 235 sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake 242 236 sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt 243 237 cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit 238 + substituteInPlace CMakeLists.txt \ 239 + --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)' 244 240 ''; 245 241 246 242 preConfigure = '' ··· 255 251 256 252 nativeBuildInputs = [ 257 253 wrapGAppsHook3 258 - wrapQtAppsHook 254 + qt6Packages.wrapQtAppsHook 259 255 pkg-config 260 256 cmake 261 257 git 262 258 python3 263 - qttools 259 + qt6Packages.qttools # for translations 264 260 ]; 265 261 266 262 buildInputs = [ 267 263 ffmpeg_6 264 + html-tidy 265 + hunspell 268 266 libnotify 267 + md4c 269 268 networkmanager 270 - qtbase 271 - qt5compat 272 269 qrencode 273 - qtnetworkauth 274 - qtdeclarative 275 - qtmultimedia 276 - qtpositioning 277 - qtsvg 278 - qtwebchannel 270 + zxing-cpp 279 271 ] 280 - ++ 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 + ); 281 286 282 287 cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; 283 288
-6
pkgs/top-level/all-packages.nix
··· 16205 16205 16206 16206 sieveshell = with python3.pkgs; toPythonApplication managesieve; 16207 16207 16208 - jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { 16209 - # TODO: remove once `udev` is `systemdMinimal` everywhere. 16210 - udev = systemdMinimal; 16211 - jack = libjack2; 16212 - }; 16213 - 16214 16208 gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; 16215 16209 16216 16210 inherit (callPackage ../applications/misc/zettlr { }) zettlr;