Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5709214f80f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cfd7a08c578e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 11, 2020

  1. liblinphone: fix missing vcard_grammar 

    Fixes #84488
    @jluttine
    jluttine committed Apr 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    93ea5b0 View commit details

Commits on Apr 12, 2020

  1. Merge pull request #84991 from jluttine/liblinphone-fix-vcard 

    liblinphone: fix missing vcard_grammar
    @7c6f434c
    7c6f434c authored Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cfd7a08 View commit details
Showing with 9 additions and 1 deletion.
  1. +0 −1 pkgs/applications/networking/instant-messengers/linphone/default.nix
  2. +9 −0 pkgs/development/libraries/liblinphone/default.nix
1 change: 0 additions & 1 deletion pkgs/applications/networking/instant-messengers/linphone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -223,7 +223,6 @@ mkDerivation rec {
cp linphone.desktop $out/share/applications/
cp -r ../assets/icons $out/share/
mkdir -p $out/share/belr/grammars
ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/
ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
mkdir -p $out/share/linphone
ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
9 changes: 9 additions & 0 deletions pkgs/development/libraries/liblinphone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -140,6 +140,15 @@ stdenv.mkDerivation rec {
pkgconfig
];

# Some grammar files needed to be copied too from some dependencies. I suppose
# if one define a dependency in such a way that its share directory is found,
# then this copying would be unnecessary. Instead of actually copying these
# files, create a symlink.
postInstall = ''
mkdir -p $out/share/belr/grammars
ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/
'';

meta = with stdenv.lib; {
homepage = "https://www.linphone.org/technical-corner/liblinphone";
description = "Library for SIP calls and instant messaging";