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.
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user