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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-08 18:22:46 +00:00
committed by GitHub
parent 20549cae36 094283528b
commit 6d46d8a9b9
86 changed files with 1267 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/amtk/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
, gobject-introspection
, gnome
, dbus
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux;
checkPhase = ''
export NO_AT_BRIDGE=1
${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
'';
pkgs/development/libraries/gjs/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
, harfbuzz
, makeWrapper
, which
, xvfb_run
, xvfb-run
, nixosTests
}:
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
] ++ testDeps;
propagatedBuildInputs = [
pkgs/development/libraries/gtkmm/4.x.nix
+2 -2
View File
@@ -12,7 +12,7 @@
, epoxy
, gnome
, makeFontsConf
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
];
# Tests require fontconfig.
pkgs/development/libraries/gtksourceview/3.x.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }:
stdenv.mkDerivation rec {
pname = "gtksourceview";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
checkInputs = [ xvfb_run dbus ];
checkInputs = [ xvfb-run dbus ];
buildInputs = [ atk cairo glib pango libxml2 gettext ];
pkgs/development/libraries/gtksourceview/4.x.nix
+2 -2
View File
@@ -18,7 +18,7 @@
, gnome
, gobject-introspection
, dbus
, xvfb_run
, xvfb-run
, shared-mime-info
}:
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
dbus
];
pkgs/development/libraries/gtksourceview/5.x.nix
+2 -2
View File
@@ -16,7 +16,7 @@
, gnome
, gobject-introspection
, dbus
, xvfb_run
, xvfb-run
, shared-mime-info
}:
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
dbus
];
pkgs/development/libraries/libadwaita/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
, vala
, gobject-introspection
, gtk4
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
];
doCheck = true;
pkgs/development/libraries/libdazzle/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome }:
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }:
stdenv.mkDerivation rec {
pname = "libdazzle";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv";
};
nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ];
buildInputs = [ glib gtk3 ];
mesonFlags = [
pkgs/development/libraries/libhandy/0.x.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome
, dbus, xvfb_run, libxml2
, dbus, xvfb-run, libxml2
, hicolor-icon-theme
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ];
checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
checkInputs = [ dbus xvfb-run hicolor-icon-theme ];
mesonFlags = [
"-Dgtk_doc=true"
pkgs/development/libraries/libhandy/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, enableGlade ? false
, glade
, dbus
, xvfb_run
, xvfb-run
, libxml2
, gdk-pixbuf
, librsvg
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
xvfb_run
xvfb-run
at-spi2-atk
at-spi2-core
librsvg
pkgs/development/libraries/libsecret/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
, gtk-doc, gnome, gjs, libintl, dbus, xvfb_run }:
, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }:
stdenv.mkDerivation rec {
pname = "libsecret";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installCheckInputs = [
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs
];
# needs to run after install because typelibs point to absolute paths
pkgs/development/libraries/xine-lib/default.nix
+3 -10
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, aalib
, alsaLib
, ffmpeg
@@ -16,6 +15,7 @@
, libtheora
, libv4l
, libvorbis
, ncurses
, perl
, pkg-config
, speex
@@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
libtheora
libv4l
libvorbis
ncurses
perl
speex
vcdimager
@@ -64,18 +65,10 @@ stdenv.mkDerivation rec {
libxcb
]);
patches = [
# splitting path plugin
(fetchpatch {
name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch";
url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/";
sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls=";
})
];
enableParallelBuilding = true;
NIX_LDFLAGS = "-lxcb-shm";
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://www.xinehq.de/";