summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndré Vitor de Lima Matos <andre.vmatos@gmail.com>2021-09-23 12:24:59 -0300
committerAndré Vitor de Lima Matos <andre.vmatos@gmail.com>2021-09-23 12:26:15 -0300
commit47480082716d0adc497b3413b388242b890ffd13 (patch)
treea4df3029a639539d53819153cc5c0eb73953240d
parentf5dbd04c201f40b59d9b766d4d6914392a7b66e4 (diff)
downloadnixpkgs-47480082716d0adc497b3413b388242b890ffd13.tar
nixpkgs-47480082716d0adc497b3413b388242b890ffd13.tar.gz
nixpkgs-47480082716d0adc497b3413b388242b890ffd13.tar.bz2
nixpkgs-47480082716d0adc497b3413b388242b890ffd13.tar.lz
nixpkgs-47480082716d0adc497b3413b388242b890ffd13.tar.xz
nixpkgs-47480082716d0adc497b3413b388242b890ffd13.tar.zst
nixpkgs-47480082716d0adc497b3413b388242b890ffd13.zip
kde-frameworks: add zstd to karchive and isocodes do kcontacts
Suggested by @eliasp, to improve compatibility and address missing
runtime dependency.
-rw-r--r--pkgs/development/libraries/kde-frameworks/karchive.nix4
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcontacts.nix5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 3602cb7b061..bd010f3f11c 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,13 +1,13 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  bzip2, xz, qtbase, zlib,
+  bzip2, xz, qtbase, zlib, zstd
 }:
 
 mkDerivation {
   name = "karchive";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ bzip2 xz zlib ];
+  buildInputs = [ bzip2 xz zlib zstd ];
   propagatedBuildInputs = [ qtbase ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
index 74b6652aee2..56887b775f4 100644
--- a/pkgs/development/libraries/kde-frameworks/kcontacts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules,
+  extra-cmake-modules, isocodes,
   kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
 }:
 
@@ -9,6 +9,9 @@ mkDerivation {
   meta = {
     license = [ lib.licenses.lgpl21 ];
   };
+  propagatedBuildInputs = [
+    isocodes
+  ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
   outputs = [ "out" "dev" ];