Unverified Commit be7ffb6c authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

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

parents 9b6c6285 8fb5f3a7

pkgs/applications/networking/instant-messengers/jami/default.nix→pkgs/by-name/ja/jami/package.nix

+29 −24
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
  gmp,

  gnutls,

  llhttp,

  jack,

  jsoncpp,

  libarchive,

  libgit2,

  libjack2,

  libnatpmp,

  libpulseaudio,

  libupnp,
@@ -42,20 +42,14 @@ 
  git,

  networkmanager, # for libnm

  python3,

  qttools, # for translations

  wrapQtAppsHook,

  libnotify,

  qt5compat,

  qtbase,

  qtdeclarative,

  md4c,

  html-tidy,

  hunspell,

  qrencode,

  qtmultimedia,

  qtnetworkauth,

  qtpositioning,

  qtsvg,

  qtwebengine,

  qtwebchannel,

  qt6Packages,

  wrapGAppsHook3,

  zxing-cpp,

  withWebengine ? true,



  # for pjsip
@@ -206,7 +200,7 @@ stdenv.mkDerivation rec { 
      gmp

      gnutls

      llhttp

      jack

      libjack2

      jsoncpp

      libarchive

      libgit2
@@ -241,6 +235,8 @@ stdenv.mkDerivation rec { 
    sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake

    sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt

    cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit

    substituteInPlace CMakeLists.txt \

      --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'

  '';



  preConfigure = ''
@@ -255,21 +251,29 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [

    wrapGAppsHook3

    wrapQtAppsHook

    qt6Packages.wrapQtAppsHook

    pkg-config

    cmake

    git

    python3

    qttools

    qt6Packages.qttools # for translations

  ];



  buildInputs = [

    ffmpeg_6

    html-tidy

    hunspell

    libnotify

    md4c

    networkmanager

    qrencode

    zxing-cpp

  ]

  ++ (

    with qt6Packages;

    [

      qtbase

      qt5compat

    qrencode

      qtnetworkauth

      qtdeclarative

      qtmultimedia
@@ -277,7 +281,8 @@ stdenv.mkDerivation rec { 
      qtsvg

      qtwebchannel

    ]

  ++ lib.optionals withWebengine [ qtwebengine ];

    ++ lib.optionals withWebengine [ qtwebengine ]

  );



  cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];

pkgs/top-level/all-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -16205,12 +16205,6 @@ with pkgs; 


  sieveshell = with python3.pkgs; toPythonApplication managesieve;



  jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {

    # TODO: remove once `udev` is `systemdMinimal` everywhere.

    udev = systemdMinimal;

    jack = libjack2;

  };



  gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };



  inherit (callPackage ../applications/misc/zettlr { }) zettlr;