public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.cairo2: 0.5 -> 0.6 (#57965)

Browse Source
This commit is contained in:
Vincent Laporte 2019-03-26 15:11:37 +01:00 committed by GitHub
parent 4ad932483c
commit 853b589f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/development/ocaml-modules/cairo2/default.nix
View File

@ -1,43 +1,22 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, { stdenv, lib, fetchurl, buildDunePackage
enableGtkSupport ? true # Whether to compile with support for Gtk , pkgconfig, cairo
# integration (library file cairo2_gtk). Depends
# on lablgtk and gtk2.
}: }:
let buildDunePackage rec {
inherit (stdenv.lib) optionals; pname = "cairo2";
version = "0.5"; version = "0.6";
in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-cairo2-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml findlib ocamlbuild cairo ] buildInputs = [ cairo ];
++ optionals enableGtkSupport [ gtk2 ];
# lablgtk2 is marked as a propagated build input since loading the doCheck = !stdenv.isDarwin;
# cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as
# well.
propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ];
createFindlibDestdir = true; meta = {
configurePhase = "ocaml setup.ml -configure --prefix $out"
+ (if enableGtkSupport then " --enable-lablgtk2"
else " --disable-lablgtk2");
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
meta = with stdenv.lib; {
homepage = "https://github.com/Chris00/ocaml-cairo"; homepage = "https://github.com/Chris00/ocaml-cairo";
description = "Binding to Cairo, a 2D Vector Graphics Library"; description = "Binding to Cairo, a 2D Vector Graphics Library";
longDescription = '' longDescription = ''
@ -46,8 +25,7 @@ stdenv.mkDerivation {
the X Window System, Quartz, Win32, image buffers, PostScript, PDF, the X Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output. and SVG file output.
''; '';
license = licenses.lgpl3; license = lib.licenses.lgpl3;
platforms = ocaml.meta.platforms or []; maintainers = with lib.maintainers; [ jirkamarsik vbgl ];
maintainers = [ maintainers.jirkamarsik ];
}; };
} }

4
pkgs/top-level/ocaml-packages.nix
View File

@ -357,9 +357,7 @@ let
lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgl = callPackage ../development/ocaml-modules/lablgl { };
lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };
cairo2 = cairo2.override { enableGtkSupport = false; };
};
lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { };