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

Merge pull request #87974 from jtojnar/gnome-more-updates

Browse Source
This commit is contained in:
Jan Tojnar 2020-05-17 08:35:51 +02:00 committed by GitHub
commit e16ca535e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 105 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View File

@ -27,22 +27,13 @@
stdenv.mkDerivation rec {
pname = "gnome-clocks";
version = "3.36.0";
version = "3.36.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc";
sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY=";
};
passthru = {
updateScript = gnome3.updateScript {
packageName = "gnome-clocks";
attrPath = "gnome3.gnome-clocks";
};
};
doCheck = true;
nativeBuildInputs = [
vala
meson
@ -55,6 +46,7 @@ stdenv.mkDerivation rec {
libxml2
gobject-introspection # for finding vapi files
];
buildInputs = [
gtk3
glib
@ -76,6 +68,15 @@ stdenv.mkDerivation rec {
)
'';
doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = "gnome-clocks";
attrPath = "gnome3.gnome-clocks";
};
};
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Apps/Clocks";
description = "Clock application designed for GNOME 3";

54
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
View File

@ -1,26 +1,58 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
, gnome3
, glib
, gtk3
, wrapGAppsHook
, gettext
, itstool
, libxml2
, libxslt
, docbook_xsl
, docbook_xml_dtd_43
, systemd
, python3
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "gnome-logs";
version = "3.34.0";
version = "3.36.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m";
sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA=";
};
nativeBuildInputs = [
python3
meson
ninja
pkgconfig
wrapGAppsHook
gettext
itstool
libxml2
libxslt
docbook_xsl
docbook_xml_dtd_43
];
buildInputs = [
glib
gtk3
systemd
gsettings-desktop-schemas
gnome3.adwaita-icon-theme
];
mesonFlags = [
"-Dman=true"
];
nativeBuildInputs = [
python3
meson ninja pkgconfig wrapGAppsHook gettext itstool
libxml2 libxslt docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py

60
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View File

@ -1,24 +1,60 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
, gettext
, itstool
, python3
, wrapGAppsHook
, cairo
, gdk-pixbuf
, colord
, glib
, gtk3
, gusb
, packagekit
, libwebp
, libxml2
, sane-backends
, vala
, gnome3
, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "simple-scan";
version = "3.36.2";
version = "3.36.2.1";
src = fetchurl {
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf";
sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs=";
};
buildInputs = [
cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb
gtk3 libwebp packagekit sane-backends vala
];
nativeBuildInputs = [
meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
# For setup hook
gobject-introspection
meson
ninja
gettext
itstool
pkgconfig
python3
wrapGAppsHook
libxml2
gobject-introspection # For setup hook
];
buildInputs = [
cairo
gdk-pixbuf
colord
glib
gnome3.adwaita-icon-theme
gusb
gtk3
libwebp
packagekit
sane-backends
vala
];
postPatch = ''

12
pkgs/development/libraries/pipewire/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv
, fetchFromGitLab
, fetchpatch
, meson
, ninja
, pkgconfig
@ -33,7 +32,7 @@ let
in
stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.2";
version = "0.3.5";
outputs = [ "out" "lib" "dev" "doc" ];
@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs=";
sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ=";
};
nativeBuildInputs = [
@ -73,13 +72,6 @@ stdenv.mkDerivation rec {
vulkan-loader
xorg.libX11
];
patches = [
# fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch";
sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x";
})
];
mesonFlags = [
"-Ddocs=true"