MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45627 from jtojnar/gnome-cleanup

Browse source 
Gnome cleanup
This commit is contained in:
Jan Tojnar 2018-08-25 22:14:51 +02:00 committed by GitHub
commit e8a6d22174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/newsreaders/pan/default.nix
View file

@ -2,7 +2,7 @@
, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
, makeWrapper, gnupg
, gnomeSupport ? true, libgnome-keyring3
, gnomeSupport ? true, gnome3, libsecret
}:
assert spellChecking -> gtkspell3 != null;
@ -17,10 +17,10 @@ stdenv.mkDerivation {
sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
buildInputs = [ gtk3 gmime2 libnotify gnutls ]
++ stdenv.lib.optional spellChecking gtkspell3
++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ];
configureFlags = [
"--with-dbus"

12
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
, intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland
, libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }:
@ -30,18 +30,16 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ];
patches = [
./bubblewrap-paths.patch
(substituteAll {
src = ./bubblewrap-paths.patch;
BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap";
})
];
configureFlags = [
"--enable-gtk-doc"
];
postPatch = ''
substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \
BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap"
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "gnome-desktop";

27
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt
, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook
, docbook_xsl, docbook_xml_dtd_42, gnome3 }:
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt
, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook
, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
stdenv.mkDerivation rec {
name = "gnome-keyring-${version}";
@ -11,21 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; };
};
outputs = [ "out" "dev" ];
buildInputs = with gnome3; [
dbus libgcrypt pam gtk3 libgnome-keyring openssh
pango gcr gdk_pixbuf atk p11-kit
buildInputs = [
glib libgcrypt pam openssh libcap_ng libselinux
gcr p11-kit
];
propagatedBuildInputs = [ glib libtasn1 libxslt ];
nativeBuildInputs = [
pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook
];
configureFlags = [
@ -48,6 +42,13 @@ stdenv.mkDerivation rec {
make check
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "gnome-keyring";
attrPath = "gnome3.gnome-keyring";
};
};
meta = with stdenv.lib; {
description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications";
homepage = https://wiki.gnome.org/Projects/GnomeKeyring;

3
pkgs/desktops/xfce4-13/xfce4-settings/default.nix
View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, automakeAddFlags, dbus-glib, exo, garcon, gtk3
{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3
, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
, upower ? null, xfconf, xf86inputlibinput ? null }:
@ -19,7 +19,6 @@ mkXfceDerivation rec {
nativeBuildInputs = [ automakeAddFlags ];
buildInputs = [
dbus-glib
exo
garcon
gtk3

6
pkgs/development/libraries/umockdev/default.nix
View file

@ -1,10 +1,12 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libtool
{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection
, pkgconfig, glib, systemd, libgudev, vala }:
stdenv.mkDerivation rec {
name = "umockdev-${version}";
version = "0.11.3";
outputs = [ "bin" "out" "dev" "doc" ];
src = fetchFromGitHub {
owner = "martinpitt";
repo = "umockdev";
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ];
nativeBuildInputs = [ autoreconfHook pkgconfig vala gobjectIntrospection ];
enableParallelBuilding = true;

4
pkgs/tools/networking/modem-manager/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig
{ stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig
, libmbim, libqmi, systemd, fetchpatch }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];
buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ];
patches = [
# Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt)