commit 73a4508d56c1df4a4efc0436b88f352ee2e69a15 · pyrox.dev/nixpkgs

-19

pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common

···

       1
       1
       -
       --disable-sound

     

       2
       2
       -
       --enable-video

     

       3
       3
       -
       --enable-ext-sound

     

       4
       4
       -
       --disable-speex-aec

     

       5
       5
       -
       --disable-g711-codec

     

       6
       6
       -
       --disable-l16-codec

     

       7
       7
       -
       --disable-gsm-codec

     

       8
       8
       -
       --disable-g722-codec

     

       9
       9
       -
       --disable-g7221-codec

     

       10
       10
       -
       --disable-speex-codec

     

       11
       11
       -
       --disable-ilbc-codec

     

       12
       12
       -
       --disable-opencore-amr

     

       13
       13
       -
       --disable-silk

     

       14
       14
       -
       --disable-sdl

     

       15
       15
       -
       --disable-ffmpeg

     

       16
       16
       -
       --disable-v4l2

     

       17
       17
       -
       --disable-openh264

     

       18
       18
       -
       --disable-resample

     

       19
       19
       -
       --disable-libwebrtc

-1

pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux

···

       1
       1
       -
       --enable-epoll

-1

pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches

···

       1
       1
       -
       0009-add-config-site.patch

+65 -25

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

···

       35
       35
        
       

     

       36
       36
        
         # for client

     

       37
       37
        
       , cmake

     

       38
       38
       +
       , git

     

       38
       39
        
       , networkmanager # for libnm

     

       39
       40
        
       , python3

     

       40
       41
        
       , qttools # for translations

     
···

       61
       62
        
       , opendht

     

       62
       63
        
       }:

     

       63
       64
        
       

     

       64
       64
       -
       let

     

       65
       65
       -
         readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file));

     

       66
       66
       -
       in

     

       67
       65
        
       stdenv.mkDerivation rec {

     

       68
       66
        
         pname = "jami";

     

       69
       69
       -
         version = "20231201.0";

     

       67
       67
       +
         version = "20240430.0";

     

       70
       68
        
       

     

       71
       69
        
         src = fetchFromGitLab {

     

       72
       70
        
           domain = "git.jami.net";

     

       73
       71
        
           owner = "savoirfairelinux";

     

       74
       72
        
           repo = "jami-client-qt";

     

       75
       73
        
           rev = "stable/${version}";

     

       76
       76
       -
           hash = "sha256-A38JwjqdQVy03d738p2tpTFA6EWRSPNiesS5wZfti7Y=";

     

       74
       74
       +
           hash = "sha256-v7558m2h3RqvLLhf3BdYO9LKCFKuMTtPIXgH6OXiiY4=";

     

       77
       75
        
           fetchSubmodules = true;

     

       78
       76
        
         };

     

       79
       77
        
       

     

       80
       80
       -
         pjsip-jami = pjsip.overrideAttrs (old:

     

       81
       81
       -
           let

     

       82
       82
       -
             patch-src = src + "/daemon/contrib/src/pjproject/";

     

       83
       83
       -
           in

     

       84
       84
       -
           rec {

     

       85
       85
       -
             version = "311bd018fc07aaf62d4c2d2494e08b5ee97e6846";

     

       78
       78
       +
         pjsip-jami = pjsip.overrideAttrs (old: rec {

     

       79
       79
       +
           version = "797f1a38cc1066acc4adc9561aa1288afabe72d5";

     

       86
       80
        
       

     

       87
       87
       -
             src = fetchFromGitHub {

     

       88
       88
       -
               owner = "savoirfairelinux";

     

       89
       89
       -
               repo = "pjproject";

     

       90
       90
       -
               rev = version;

     

       91
       91
       -
               hash = "sha256-pZiOSOUxAXzMY4c1/AyKcwa7nyIJC/ZVOqDg9/QO/Nk=";

     

       92
       92
       -
             };

     

       81
       81
       +
           src = fetchFromGitHub {

     

       82
       82
       +
             owner = "savoirfairelinux";

     

       83
       83
       +
             repo = "pjproject";

     

       84
       84
       +
             rev = version;

     

       85
       85
       +
             hash = "sha256-lTDbJF09R2G+EIkMj1YyKa4XokH9LlcIG+RhRJhzUes=";

     

       86
       86
       +
           };

     

       93
       87
        
       

     

       94
       94
       -
             patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));

     

       88
       88
       +
           configureFlags = [

     

       89
       89
       +
             "--disable-sound"

     

       90
       90
       +
             "--enable-video"

     

       91
       91
       +
             "--enable-ext-sound"

     

       92
       92
       +
             "--disable-speex-aec"

     

       93
       93
       +
             "--disable-g711-codec"

     

       94
       94
       +
             "--disable-l16-codec"

     

       95
       95
       +
             "--disable-gsm-codec"

     

       96
       96
       +
             "--disable-g722-codec"

     

       97
       97
       +
             "--disable-g7221-codec"

     

       98
       98
       +
             "--disable-speex-codec"

     

       99
       99
       +
             "--disable-ilbc-codec"

     

       100
       100
       +
             "--disable-opencore-amr"

     

       101
       101
       +
             "--disable-silk"

     

       102
       102
       +
             "--disable-sdl"

     

       103
       103
       +
             "--disable-ffmpeg"

     

       104
       104
       +
             "--disable-v4l2"

     

       105
       105
       +
             "--disable-openh264"

     

       106
       106
       +
             "--disable-resample"

     

       107
       107
       +
             "--disable-libwebrtc"

     

       108
       108
       +
             "--with-gnutls=yes"

     

       109
       109
       +
           ]

     

       110
       110
       +
           ++ lib.optionals stdenv.isLinux [

     

       111
       111
       +
             "--enable-epoll"

     

       112
       112
       +
           ];

     

       95
       113
        
       

     

       96
       96
       -
             configureFlags = (readLinesToList ./config/pjsip_args_common)

     

       97
       97
       -
               ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);

     

       98
       98
       -
           });

     

       114
       114
       +
           buildInputs = old.buildInputs ++ [ gnutls ];

     

       115
       115
       +
         });

     

       99
       116
        
       

     

       100
       100
       -
         opendht-jami = opendht.override {

     

       117
       117
       +
         opendht-jami = (opendht.overrideAttrs {

     

       118
       118
       +
           src = fetchFromGitHub {

     

       119
       119
       +
             owner = "savoirfairelinux";

     

       120
       120
       +
             repo = "opendht";

     

       121
       121
       +
             rev = "f2cee8e9ce24746caa7dee1847829c526d340284";

     

       122
       122
       +
             hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA=";

     

       123
       123
       +
           };

     

       124
       124
       +
         }).override {

     

       101
       125
        
           enableProxyServerAndClient = true;

     

       102
       126
        
           enablePushNotifications = true;

     

       103
       127
        
         };

     

       104
       128
        
       

     

       105
       129
        
         dhtnet = stdenv.mkDerivation {

     

       106
       130
        
           pname = "dhtnet";

     

       107
       107
       -
           version = "unstable-2023-11-23";

     

       131
       131
       +
           version = "unstable-2022-04-26";

     

       108
       132
        
       

     

       109
       133
        
           src = fetchFromGitLab {

     

       110
       134
        
             domain = "git.jami.net";

     

       111
       135
        
             owner = "savoirfairelinux";

     

       112
       136
        
             repo = "dhtnet";

     

       113
       113
       -
             rev = "b1bcdecbac2a41de3941ef5a34faa6fbe4472535";

     

       114
       114
       -
             hash = "sha256-EucSsUuHXbVqr7drrTLK0f+WZT2k9Tx/LV+IBldTQO8=";

     

       137
       137
       +
             rev = "d7976982d24867c6faaf8103504ec8a10d932fa0";

     

       138
       138
       +
             hash = "sha256-vazFDMIu/3AWeOz0LZhZD9NFO8cd5AK41zBpqpQrqnc=";

     

       115
       139
        
           };

     

       116
       140
        
       

     

       117
       141
        
           nativeBuildInputs = [

     
···

       130
       154
        
             opendht-jami

     

       131
       155
        
             openssl

     

       132
       156
        
             pjsip-jami

     

       157
       157
       +
             python3

     

       133
       158
        
             restinio

     

       134
       159
        
           ];

     

       135
       160
        
       

     
···

       193
       218
        
           enableParallelBuilding = true;

     

       194
       219
        
         };

     

       195
       220
        
       

     

       221
       221
       +
         qwindowkit = fetchFromGitHub {

     

       222
       222
       +
           owner = "stdware";

     

       223
       223
       +
           repo = "qwindowkit";

     

       224
       224
       +
           rev = "79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef";

     

       225
       225
       +
           hash = "sha256-iZfmv3ADVjHf47HPK/FdrfeAzrXbxbjH3H5MFVg/ZWE=";

     

       226
       226
       +
           fetchSubmodules = true;

     

       227
       227
       +
         };

     

       228
       228
       +
       

     

       229
       229
       +
         postPatch = ''

     

       230
       230
       +
           sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake

     

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

     

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

     

       233
       233
       +
         '';

     

       234
       234
       +
       

     

       196
       235
        
         preConfigure = ''

     

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

     

       198
       237
        
           # Currently the daemon is still built seperately but jami expects it in CMAKE_INSTALL_PREFIX

     
···

       208
       247
        
           wrapQtAppsHook

     

       209
       248
        
           pkg-config

     

       210
       249
        
           cmake

     

       250
       250
       +
           git

     

       211
       251
        
           python3

     

       212
       252
        
           qttools

     

       213
       253
        
         ];

+2 -2

pkgs/development/libraries/opendht/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "opendht";

     

       24
       24
       -
         version = "3.1.4";

     

       24
       24
       +
         version = "3.1.11";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "savoirfairelinux";

     

       28
       28
        
           repo = "opendht";

     

       29
       29
        
           rev = "v${version}";

     

       30
       30
       -
           hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw=";

     

       30
       30
       +
           hash = "sha256-lJaQGkhpKfSSNVbP+NqommagtoWyi8CdauVxEhiI9Bc=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [