diff options
author | Domen Kožar <domen@dev.si> | 2014-01-21 14:09:21 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-01-21 14:11:20 +0100 |
commit | b4d1d88e42361ff4e184c03811b925704df4897b (patch) | |
tree | 6a8fc9ac17ba073c7c931aa4de36a06a39b4a124 | |
parent | a3716328e604db49a2db386de0d184fe733e5bc2 (diff) | |
download | nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.tar nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.tar.gz nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.tar.bz2 nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.tar.lz nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.tar.xz nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.tar.zst nixlib-b4d1d88e42361ff4e184c03811b925704df4897b.zip |
enable gobjectintrospection for some libs
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-menus/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/telepathy/glib/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix index a8e77a32bdc0..0103800b02f2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib }: +{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: let version = "3.10.1"; in @@ -10,9 +10,11 @@ stdenv.mkDerivation { sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + preBuild = "patchShebangs ./scripts"; - buildInputs=[ intltool pkgconfig glib ]; + buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; meta = { homepage = "http://www.gnome.org"; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index f44e4cbcd8b2..615641a8309c 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: +{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt +, gobjectIntrospection }: stdenv.mkDerivation rec { name = "telepathy-glib-0.22.0"; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232"; }; - propagatedBuildInputs = [dbus_glib glib python]; + propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection]; buildInputs = [pkgconfig libxslt]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 217397600946..3fb0a729dea1 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll }: +, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll +, gobjectIntrospection }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { "--with-kernel-firmware-dir=/run/current-system/firmware" "--with-session-tracking=systemd" ]; - buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 ]; + buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; |