diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
| commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
| tree | 4a99561053ba51db60a75389e483784543b105ff /pkgs/desktops/gnome-2 | |
| parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
| parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
| download | nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip | |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/desktop/zenity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 9efca75e8f87..6feaf13d88ec 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -40,4 +40,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + doCheck = false; # requires X11 daemon + } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 014255785ddf..a9b692aadf51 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -13,4 +13,6 @@ stdenv.mkDerivation { buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; + + doCheck = false; # fails, tries to access the net } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4ca0e791a2a9..9d71b999d11c 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -21,4 +21,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ GConf glib ]; postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; + + doCheck = false; # needs dbus daemon } |