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

librsvg: always build introspection

Browse Source 
We have multiple outputs nowadays.
This commit is contained in:
Jan Tojnar 2018-03-15 00:50:05 +01:00
parent 389837b139
commit 0c2ede96a0
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/syncthing-gtk/default.nix
View File

@ -18,7 +18,7 @@ buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 (librsvg.override { enableIntrospection = true; }) gtk3 librsvg
libnotify libnotify
# Schemas with proxy configuration # Schemas with proxy configuration
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas

3
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -28,8 +28,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
buildInputs = with gnome3; buildInputs = with gnome3;
[ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice
libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf librsvg
(librsvg.override { enableIntrospection = true; })
clutter networkmanager libstartup_notification telepathy-glib clutter networkmanager libstartup_notification telepathy-glib
libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server
libical nss gtk gstreamer gdm libical nss gtk gstreamer gdm

11
pkgs/development/libraries/librsvg/default.nix
View File

@ -1,9 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3 , bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3
, withGTK ? false, gtk3 ? null , withGTK ? false, gtk3 ? null
, gobjectIntrospection ? null, enableIntrospection ? false }: , vala, gobjectIntrospection }:
# no introspection by default, it's too big
let let
pname = "librsvg"; pname = "librsvg";
@ -21,17 +19,16 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ];
++ stdenv.lib.optional enableIntrospection gobjectIntrospection;
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ] nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobjectIntrospection ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices ApplicationServices
]); ]);
configureFlags = [ "--enable-introspection=auto" ] configureFlags = [ "--enable-introspection" "--enable-vala" ]
++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
NIX_CFLAGS_COMPILE NIX_CFLAGS_COMPILE

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

@ -20629,7 +20629,6 @@ with pkgs;
sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
inherit libusb1; # Shadow python.pkgs.libusb1. inherit libusb1; # Shadow python.pkgs.libusb1.
librsvg = librsvg.override { enableIntrospection = true; };
}; };
sct = callPackage ../tools/X11/sct {}; sct = callPackage ../tools/X11/sct {};