summary refs log tree commit diff
diff options
context:
space:
mode:
authorTrolli Schmittlauch <t.schmittlauch+nixos@orlives.de>2020-12-28 14:13:39 +0100
committerTrolli Schmittlauch <t.schmittlauch+nixos@orlives.de>2020-12-28 17:33:54 +0100
commitbf2a93e5079018178d1b2cfb20b94dd338220929 (patch)
treeac715f3258834af7d055a931aab386e64b136d8c
parentccb88fd162405f9b63bb201e1222ce911262a544 (diff)
downloadnixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.tar
nixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.tar.gz
nixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.tar.bz2
nixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.tar.lz
nixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.tar.xz
nixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.tar.zst
nixpkgs-bf2a93e5079018178d1b2cfb20b94dd338220929.zip
linphone: 4.2.4 -> 4.2.5
fixes a crash on incoming calls

part of updating linphone and its major dependencies
-rw-r--r--pkgs/applications/networking/instant-messengers/linphone/default.nix5
-rw-r--r--pkgs/development/libraries/liblinphone/default.nix2
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index c055718f47f..1344440eafc 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -52,7 +52,7 @@
 
 mkDerivation rec {
   pname = "linphone-desktop";
-  version = "4.2.4";
+  version = "4.2.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -175,13 +175,12 @@ mkDerivation rec {
     ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
     mkdir -p $out/share/linphone
     ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
-    mkdir $out/lib # prevent warning
   '';
 
   meta = with lib; {
     homepage = "https://www.linphone.org/";
     description = "Open source SIP phone for voice/video calls and instant messaging";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jluttine ];
   };
diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix
index 21f9833a5d5..7d7f035f77f 100644
--- a/pkgs/development/libraries/liblinphone/default.nix
+++ b/pkgs/development/libraries/liblinphone/default.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://www.linphone.org/technical-corner/liblinphone";
     description = "Library for SIP calls and instant messaging";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jluttine ];
   };