public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32624 from jtojnar/gtksourceview-3.24.6 

gtksourceview:  3.24.5 → 3.24.6
This commit is contained in:
Jan Tojnar 2017-12-14 09:42:22 +01:00 committed by GitHub
parent a38ea942f5 d075042ca3
commit 9b15ef1fc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/desktops/gnome-3/core/gtksourceview/default.nix
View File

@ -1,14 +1,22 @@
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
, libxml2Python, perl, intltool, gettext, gnome3 }: , libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
propagatedBuildInputs = [ gtk3 ]; propagatedBuildInputs = [
# Required by gtksourceview-3.0.pc
gtk3
# Used by gtk_source_language_manager_guess_language
shared_mime_info
];
nativeBuildInputs = [ pkgconfig ]; outputs = [ "out" "dev" ];
buildInputs = [ atk cairo glib pango
libxml2Python perl intltool gettext ]; nativeBuildInputs = [ pkgconfig intltool gettext perl ]
++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ atk cairo glib pango libxml2 ];
checkInputs = [ 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"
@ -16,6 +24,14 @@ stdenv.mkDerivation rec {
patches = [ ./nix_share_path.patch ]; patches = [ ./nix_share_path.patch ];
doCheck = true;
checkPhase = ''
export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
make check
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;

6
pkgs/desktops/gnome-3/core/gtksourceview/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update # Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: { fetchurl: {
name = "gtksourceview-3.24.5"; name = "gtksourceview-3.24.6";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.5.tar.xz; url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz;
sha256 = "0246185fcc20c4734d01419a83f58f251a82e2a902fe60bb0335187fcf658181"; sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
}; };
} }