dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ocamlPackages.lablgtk3: propagate gtk3 (#95849)

Browse Source
This commit is contained in:
Mario Rodas 2020-08-21 03:52:11 -05:00 committed by GitHub
parent a3aae22719
commit f96ec7d994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/logic/coq/default.nix
View File

@ -9,7 +9,6 @@
, ocamlPackages, ncurses , ocamlPackages, ncurses
, buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10")
, glib, gnome3, wrapGAppsHook , glib, gnome3, wrapGAppsHook
, darwin
, csdp ? null , csdp ? null
, version , version
}: }:
@ -116,7 +115,6 @@ self = stdenv.mkDerivation {
++ stdenv.lib.optionals buildIde ++ stdenv.lib.optionals buildIde
(if versionAtLeast "8.10" (if versionAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
else [ ocamlPackages.lablgtk ]); else [ ocamlPackages.lablgtk ]);
propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;

3
pkgs/development/ocaml-modules/lablgtk3/default.nix
View File

@ -12,8 +12,7 @@ buildDunePackage rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 ]; propagatedBuildInputs = [ gtk3 cairo2 ];
propagatedBuildInputs = [ cairo2 ];
meta = { meta = {
description = "OCaml interface to GTK 3"; description = "OCaml interface to GTK 3";