nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk-mac-integration: fix gtk3 version

Browse Source 
Include a Gtk3 version of gtk-mac-integration.
Add gobjectIntrospection to gtk-mac-integration.
Use propagatedBuildInputs for gtk.
This commit is contained in:
Hamish Mackenzie 2017-04-10 23:26:42 -07:00
parent 5dfe0f7ee6
commit 4d5ed187d3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gtk-mac-integration/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }: { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk-mac-integration-2.0.8"; name = "gtk-mac-integration-2.0.8";
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ]; nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ];
buildInputs = [ glib gtk ]; buildInputs = [ glib ];
propagatedBuildInputs = [ gtk ];
preAutoreconf = '' preAutoreconf = ''
gtkdocize gtkdocize

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

@ -7846,6 +7846,10 @@ with pkgs;
gtk = gtk2; gtk = gtk2;
}; };
gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration {
gtk = gtk3;
};
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell2 = callPackage ../development/libraries/gtkspell { };