diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-30 17:04:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-30 17:04:54 +0100 |
| commit | 2d0bead714eb5f99a08c54a3b25cd84379c251c2 (patch) | |
| tree | d1a3616057aa65e89422a1663174300d9cf2661f /pkgs/desktops/gnome-3/core | |
| parent | d2b02d662ef78d70c16ac564dfe2454522e9a424 (diff) | |
| parent | 9d4de1eac81e58f45727a069811bc7fb9b07177d (diff) | |
| download | nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.gz nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.bz2 nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.lz nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.xz nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.zst nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gtksourceview/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index ca63cbd6cb89..45001e551273 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango , libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: -stdenv.mkDerivation rec { +let + checkInputs = [ xvfb_run dbus ]; +in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; propagatedBuildInputs = [ @@ -15,8 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ] ++ stdenv.lib.optionals doCheck checkInputs; + buildInputs = [ atk cairo glib pango libxml2 ]; - checkInputs = [ xvfb_run dbus ]; preBuild = '' substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./nix_share_path.patch ]; - doCheck = true; + doCheck = stdenv.isLinux; checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ |