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

gobjectIntrospection: Enable building without X11 support.

Browse Source 
Also disable it when noXlibs in NixOS.
This commit is contained in:
Shea Levy 2018-03-01 07:36:36 -05:00
parent f66da15715
commit c54730dde8
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/config/no-x-libs.nix
View File

@ -36,6 +36,7 @@ with lib;
networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
pinentry = pkgs.pinentry_ncurses;
gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; };
};
};
}

6
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
, libintlOrEmpty, cctools, cairo
, substituteAll, nixStoreDir ? builtins.storeDir
, x11Support ? true
}:
# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
# it may be worth thinking about using multiple derivation outputs
@ -43,12 +44,11 @@ stdenv.mkDerivation rec {
src = ./absolute_shlib_path.patch;
inherit nixStoreDir;
})
# https://github.com/NixOS/nixpkgs/issues/34080
] ++ stdenv.lib.optional x11Support # https://github.com/NixOS/nixpkgs/issues/34080
(substituteAll {
src = ./absolute_gir_path.patch;
cairoLib = "${getLib cairo}/lib";
})
];
});
meta = with stdenv.lib; {
description = "A middleware layer between C libraries and language bindings";