summary refs log tree commit diff
path: root/pkgs/applications/misc/gammu
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-11-03 12:55:12 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-11-03 12:58:54 +0100
commited867a50eb89a90db3b1741bf4c0bf0cd4557dba (patch)
treea95502fbc6cb68e944d1aa5202d024c97365b09c /pkgs/applications/misc/gammu
parent5b00625aa434205774d3e1cd43852ca1cbffc046 (diff)
downloadnixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar
nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.gz
nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.bz2
nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.lz
nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.xz
nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.zst
nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.zip
iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
Diffstat (limited to 'pkgs/applications/misc/gammu')
-rw-r--r--pkgs/applications/misc/gammu/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 56e45b11c706..b90a243aec4b 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl
-, libiconv, gettext, sqlite }:
+, libiconvOrEmpty, gettext, sqlite }:
 
 with stdenv.lib;
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./bashcomp-dir.patch ];
 
-  buildInputs = [ python pkgconfig cmake bluez libusb1 curl libiconv
-    gettext sqlite ];
+  buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite ]
+    ++ libiconvOrEmpty;
 
   enableParallelBuilding = true;