Unverified Commit d45949a1 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #199821 from linsui/jami

parents ccc63196 6b237a4a

pkgs/applications/networking/instant-messengers/jami/client-qt.nix→pkgs/applications/networking/instant-messengers/jami/client.nix

+12 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, src

, jami-meta

, lib

, fetchpatch

, stdenv

, pkg-config

, cmake
@@ -25,13 +26,20 @@ 
}:



stdenv.mkDerivation {

  pname = "jami-client-qt";

  pname = "jami-client";

  inherit version src;



  sourceRoot = "source/client-qt";



  patches = [

    (fetchpatch {

      name = "fix-build-without-webengine.patch";

      url = "https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/9b2dbb64eaa9256f800dfa69d897545f4b0affd2.patch";

      hash = "sha256-lgDlSlXIjtdymBa7xSe1PabSK9DnSG5KnJggOLWyn+A=";

    })

  ];



  preConfigure = ''

    python gen-resources.py

    echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h

  '';
@@ -61,8 +69,8 @@ stdenv.mkDerivation { 
  ];



  cmakeFlags = [

    "-DRING_BUILD_DIR=${jami-daemon}/include"

    "-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"

    "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami"

    "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"

  ] ++ lib.optionals (!withWebengine) [

    "-DWITH_WEBENGINE=false"

  ];

pkgs/applications/networking/instant-messengers/jami/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
}:



let

  version = "20220825.0828.c10f01f";

  version = "20221031.1308.130cc26";



  src = fetchzip {

    url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";

    hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg=";

    hash = "sha256-+xpSoSsG+G+w8+g0FhXx+6Phroj83ijW8xWvYO+kdqY=";



    stripRoot = false;

    postFetch = ''
@@ -87,7 +87,7 @@ rec { 
    inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami;

  };



  jami-client-qt = qt6Packages.callPackage ./client-qt.nix {

  jami-client = qt6Packages.callPackage ./client.nix {

    inherit version src jami-meta ffmpeg-jami;

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ mapAliases ({ 


  jack2Full = jack2; # moved from top-level 2021-03-14

  jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15

  jami-client-qt = jami-client; # Added 2022-11-06

  jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29

  jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21

  jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -38117,7 +38117,7 @@ with pkgs; 
    udev = systemdMinimal;

    jack = libjack2;

  };

  inherit (jami) jami-daemon jami-client-qt;

  inherit (jami) jami-daemon jami-client;















  jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };