diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/libraries/liblinphone/default.nix | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/liblinphone/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/liblinphone/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 33220f193b59..c4b792e673fc 100644 --- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -1,7 +1,7 @@ -{ bctoolbox +{ lib +, bc-soci , belcard , belle-sip -, belr , cmake , doxygen , fetchFromGitLab @@ -10,9 +10,7 @@ , lime , mediastreamer , python3 -, bc-soci , sqlite -, lib , stdenv , xercesc , zxing-cpp @@ -31,6 +29,12 @@ stdenv.mkDerivation rec { hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; }; + patches = [ + # zxing-cpp 2.0+ requires C++ 17 + # Manual backport as upstream ran formatters in the meantime + ./backport-cpp17.patch + ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace "jsoncpp_object" "jsoncpp" \ |