diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-04-12 00:22:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 00:22:24 +0000 |
| commit | cfd7a08c578ea118417b4c5f62eedde84fc1c7a0 (patch) | |
| tree | 89236ca24ea55c907232f347fa244d2d47d7aaa7 /pkgs | |
| parent | 5709214f80f7f56733712f80252b34bd6a344799 (diff) | |
| parent | 93ea5b0d0d466c300f8cc55c90f4c682a6d148e9 (diff) | |
| download | nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.tar nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.tar.gz nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.tar.bz2 nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.tar.lz nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.tar.xz nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.tar.zst nixlib-cfd7a08c578ea118417b4c5f62eedde84fc1c7a0.zip | |
Merge pull request #84991 from jluttine/liblinphone-fix-vcard
liblinphone: fix missing vcard_grammar
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/linphone/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/liblinphone/default.nix | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index ced6f91fa1c8..0d97fcbbf511 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -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/ diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index c6628e9043cd..a0ee8fe00539 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -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"; |