diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-01 07:36:36 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-01 07:36:36 -0500 |
commit | c54730dde8861b9baf68a25096f4a1ae896a63a7 (patch) | |
tree | 7909ac4cd5ed1251aacceab69f7da828ab6ae830 /pkgs/development/libraries/gobject-introspection | |
parent | f66da15715758ce9915e2785d1af23a653b97df9 (diff) |
gobjectIntrospection: Enable building without X11 support.
Also disable it when noXlibs in NixOS.
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection')
-rw-r--r-- | pkgs/development/libraries/gobject-introspection/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 870f77686b3e7..387ecc1b6cf02 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -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"; |