diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/development/ocaml-modules | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.zip | |
kill libiconvOr*
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-text/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 387c5cef19ad..44b30b368b32 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libiconvOrNull, ocaml, findlib, ncurses}: +{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}: stdenv.mkDerivation { name = "ocaml-text-0.6"; @@ -8,12 +8,9 @@ stdenv.mkDerivation { sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g"; }; - buildInputs = [ocaml findlib ncurses] - ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; + buildInputs = [ocaml findlib ncurses libiconv]; - configurePhase = - (stdenv.lib.optionalString (libiconvOrNull != null) "iconv_prefix=${libiconvOrNull} ") - + "ocaml setup.ml -configure"; + configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; createFindlibDestdir = true; |