Merge pull request #33135 from vbgl/gtksourceview-check

gtksourceview: run checks on Linux only
This commit is contained in:
Yegor Timoshenko 2017-12-30 04:32:41 +03:00 committed by GitHub
commit 26d51c8bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool gettext perl ] nativeBuildInputs = [ pkgconfig intltool gettext perl ]
++ stdenv.lib.optionals doCheck checkInputs; ++ checkInputs;
buildInputs = [ atk cairo glib pango libxml2 ]; buildInputs = [ atk cairo glib pango libxml2 ];
checkInputs = [ xvfb_run dbus ]; checkInputs = stdenv.lib.optionals doCheck [ xvfb_run dbus ];
preBuild = '' preBuild = ''
substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
patches = [ ./nix_share_path.patch ]; patches = [ ./nix_share_path.patch ];
doCheck = true; doCheck = stdenv.isLinux;
checkPhase = '' checkPhase = ''
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \