diff options
author | William A. Kennington III <william@wkennington.com> | 2015-06-26 17:25:49 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-06-26 17:25:49 -0700 |
commit | ef253212f4978eee85751c43f39adaf22a141d43 (patch) | |
tree | 6227478d1f264dec8a8562c3d2fbffac409e9dd2 /pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | |
parent | e130e9d3a3225622194b4edbd9073547d6acb984 (diff) | |
parent | 8ce4cb4de81fd2b79d8e99e74be4e4a1c481f030 (diff) | |
download | nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.gz nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.bz2 nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.lz nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.xz nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.zst nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/ocaml-modules/lablgtk/2.14.0.nix')
-rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 2e50b897f3d..1815bfc64dd 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}: +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview]; + buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; |