commit
75c88b57f9
@ -74,7 +74,7 @@
|
||||
preFixup = ''
|
||||
for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
|
||||
wrapProgram "$f" \
|
||||
--prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \
|
||||
--prefix GIO_EXTRA_MODULES : "${getLib dconf}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
|
||||
--prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
|
||||
@ -102,7 +102,7 @@ preFixup = ''
|
||||
</listitem>
|
||||
<listitem xml:id="ssec-gnome-hooks-dconf">
|
||||
<para>
|
||||
<package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.
|
||||
<package>dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem xml:id="ssec-gnome-hooks-hicolor-icon-theme">
|
||||
|
@ -55,7 +55,7 @@ in
|
||||
|
||||
# Without dconf enabled it is impossible to use IBus
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnome3.dconf ibusAutostart
|
||||
dconf ibusAutostart
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
|
@ -32,13 +32,13 @@ in
|
||||
environment.etc = optionals (cfg.profiles != {})
|
||||
(mapAttrsToList mkDconfProfile cfg.profiles);
|
||||
|
||||
services.dbus.packages = [ pkgs.gnome3.dconf ];
|
||||
services.dbus.packages = [ pkgs.dconf ];
|
||||
|
||||
# For dconf executable
|
||||
environment.systemPackages = [ pkgs.gnome3.dconf ];
|
||||
environment.systemPackages = [ pkgs.dconf ];
|
||||
|
||||
# Needed for unwrapped applications
|
||||
environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ];
|
||||
environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -281,7 +281,7 @@ in
|
||||
customDconfDb = pkgs.stdenv.mkDerivation {
|
||||
name = "gdm-dconf-db";
|
||||
buildCommand = ''
|
||||
${pkgs.gnome3.dconf}/bin/dconf compile $out ${customDconf}/dconf
|
||||
${pkgs.dconf}/bin/dconf compile $out ${customDconf}/dconf
|
||||
'';
|
||||
};
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
|
||||
{ stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
|
||||
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
|
||||
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
|
||||
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
gtksourceviewmm
|
||||
llvmPackages.clang.cc
|
||||
llvmPackages.lldb
|
||||
gnome3.dconf
|
||||
dconf
|
||||
];
|
||||
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
, bash
|
||||
, glib
|
||||
, glibcLocales
|
||||
, gnome3
|
||||
, dconf
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
bash
|
||||
glib
|
||||
gnome3.dconf
|
||||
dconf
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
hunspell
|
||||
@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gnome3.dconf
|
||||
dconf
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
@ -3,6 +3,7 @@
|
||||
, vala
|
||||
, atk
|
||||
, cairo
|
||||
, dconf
|
||||
, glib
|
||||
, gnome3
|
||||
, gtk3
|
||||
@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome-menus
|
||||
gnome3.dconf
|
||||
dconf
|
||||
gtk3
|
||||
libX11
|
||||
libXfixes
|
||||
|
@ -6,7 +6,7 @@
|
||||
, python3
|
||||
, pkgconfig
|
||||
, dmd
|
||||
, gnome3
|
||||
, dconf
|
||||
, dbus
|
||||
, gsettings-desktop-schemas
|
||||
, desktop-file-utils
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
dbus
|
||||
gettext
|
||||
gnome3.dconf
|
||||
dconf
|
||||
gsettings-desktop-schemas
|
||||
gtkd
|
||||
libsecret
|
||||
|
@ -11,7 +11,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, gnome3
|
||||
, dconf
|
||||
, gst_all_1
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
libsoup
|
||||
gettext
|
||||
gnome3.dconf
|
||||
dconf
|
||||
gspell
|
||||
glib-networking
|
||||
] ++ (with gst_all_1; [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
|
||||
{ stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-idle";
|
||||
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/telepathy-idle" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
|
||||
, gnome3, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
|
||||
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
project = "telepathy-logger";
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/telepathy-logger" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, gnome3
|
||||
, dconf
|
||||
, telepathy-glib
|
||||
, python3
|
||||
, libxslt
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$lib/libexec/mission-control-5" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
|
@ -9,6 +9,7 @@
|
||||
, makeDesktopItem
|
||||
, tzdata
|
||||
, cacert
|
||||
, dconf
|
||||
, glib
|
||||
, gtk2
|
||||
, atk
|
||||
@ -137,7 +138,7 @@ let
|
||||
gdk-pixbuf
|
||||
cairo
|
||||
pango
|
||||
gnome3.dconf
|
||||
dconf
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXrender
|
||||
|
@ -5,6 +5,7 @@
|
||||
, cups
|
||||
, dbus-glib
|
||||
, dbus
|
||||
, dconf
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1dgxzprpb8f5wpmvlvkxix0xxckfgjsi3wfcy9mb221a17cv0029";
|
||||
};
|
||||
|
||||
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
|
||||
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ];
|
||||
|
||||
phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
|
||||
, pkgconfig, gtksourceview, pango, gettext
|
||||
, pkgconfig, gtksourceview, pango, gettext, dconf
|
||||
, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
--prefix XDG_DATA_DIRS : "$out/share" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
|
||||
findutils, xdg_utils, gnome3, gtk3, pythonPackages,
|
||||
findutils, xdg_utils, dconf, gtk3, pythonPackages,
|
||||
wrapGAppsHook
|
||||
}:
|
||||
|
||||
@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gnome3.dconf
|
||||
dconf
|
||||
pythonPackages.pyxdg
|
||||
pythonPackages.ptyprocess
|
||||
pythonPackages.pycairo
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme,
|
||||
{ stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme,
|
||||
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome3.dconf
|
||||
dconf
|
||||
deepin-gtk-theme
|
||||
deepin-icon-theme
|
||||
deepin-sound-theme
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
|
||||
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf
|
||||
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
|
||||
|
||||
let
|
||||
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
|
||||
gettext docbook_xsl libxml2 gobject-introspection python3
|
||||
];
|
||||
|
||||
buildInputs = [ glib gtk3 gnome3.dconf ];
|
||||
buildInputs = [ glib gtk3 dconf ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
|
||||
, accountsservice, libX11, gnome3, systemd, autoreconfHook
|
||||
, accountsservice, libX11, gnome3, systemd, autoreconfHook, dconf
|
||||
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
|
||||
, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
|
||||
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
|
||||
nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool dconf ];
|
||||
buildInputs = [
|
||||
glib accountsservice systemd
|
||||
gobject-introspection libX11 gtk3
|
||||
|
@ -35,7 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
caribou = callPackage ./core/caribou { };
|
||||
|
||||
dconf = callPackage ./core/dconf { };
|
||||
dconf-editor = callPackage ./core/dconf-editor { };
|
||||
|
||||
empathy = callPackage ./core/empathy { };
|
||||
@ -359,4 +358,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
inherit (pkgs) gjs; # added 2019-01-05
|
||||
|
||||
inherit (pkgs) yelp-tools; # added 2019-11-20
|
||||
|
||||
inherit (pkgs) dconf; # added 2019-11-30
|
||||
})
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
|
||||
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
|
||||
desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
|
||||
desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
librsvg
|
||||
libappindicator-gtk3
|
||||
gtk3
|
||||
gnome3.dconf
|
||||
dconf
|
||||
hicolor-icon-theme
|
||||
mate.mate-desktop
|
||||
mate.libmatekbd
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-desktop";
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome3.dconf
|
||||
dconf
|
||||
gtk3
|
||||
isocodes
|
||||
];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-panel";
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
librsvg
|
||||
libxml2
|
||||
gtk3
|
||||
gnome3.dconf
|
||||
dconf
|
||||
mate.libmateweather
|
||||
mate.mate-desktop
|
||||
mate.mate-menus
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
|
||||
libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate,
|
||||
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
|
||||
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
|
||||
wrapGAppsHook, fetchpatch, autoreconfHook }:
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
nss
|
||||
polkit
|
||||
gtk3
|
||||
gnome3.dconf
|
||||
dconf
|
||||
mate.mate-desktop
|
||||
mate.libmatekbd
|
||||
mate.libmatemixer
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-terminal";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
vte
|
||||
gtk3
|
||||
gnome3.dconf
|
||||
dconf
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,8 +3,6 @@
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
#### NixOS support
|
||||
|
||||
inherit (pkgs.gnome3) dconf;
|
||||
|
||||
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
|
||||
|
||||
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
|
||||
@ -217,4 +215,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
thunar-bare = thunar.override {
|
||||
thunarPlugins = [];
|
||||
};
|
||||
|
||||
# added 2019-11-30
|
||||
inherit (pkgs) dconf;
|
||||
})
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
, dbus
|
||||
, glib
|
||||
, dconf
|
||||
, libX11
|
||||
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
|
||||
, libXi
|
||||
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
# Cannot use wrapGAppsHook'due to a dependency cycle
|
||||
wrapProgram $out/libexec/at-spi-bus-launcher \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
|
||||
'';
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
|
||||
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
|
||||
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse, nixosTests
|
||||
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
|
||||
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, dconf, gsettings-desktop-schemas, librsvg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flatpak";
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
|
||||
bubblewrap bzip2 dbus dconf glib gpgme json-glib libarchive libcap libseccomp
|
||||
libsoup lzma ostree polkit python3 systemd xorg.libXau fuse
|
||||
gsettings-desktop-schemas glib-networking
|
||||
librsvg # for flatpak-validate-icon
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook
|
||||
, libsndfile, libtool, makeWrapper, perlPackages
|
||||
, xorg, libcap, alsaLib, glib, gnome3
|
||||
, xorg, libcap, alsaLib, glib, dconf
|
||||
, avahi, libjack2, libasyncns, lirc, dbus
|
||||
, sbc, bluez5, udev, openssl, fftwFloat
|
||||
, speexdsp, systemd, webrtc-audio-processing
|
||||
@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
wrapProgram $out/libexec/pulse/gsettings-helper \
|
||||
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
|
||||
--prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules"
|
||||
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
|
||||
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
|
||||
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
|
||||
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
|
||||
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
|
||||
, bison, flex, libpthreadstubs, libX11
|
||||
, embree2, makeWrapper, gsettings-desktop-schemas, glib
|
||||
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
|
||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
|
||||
# needed for XDG_ICON_DIRS
|
||||
gnome3.adwaita-icon-theme
|
||||
makeWrapper
|
||||
(stdenv.lib.getLib gnome3.dconf)
|
||||
(stdenv.lib.getLib dconf)
|
||||
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -66,7 +66,7 @@ in stdenv.mkDerivation {
|
||||
wrapProgram "$out/bin/luxcoreui" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
|
||||
libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
|
||||
libappindicator-gtk3, gst_all_1, gtk3, dconf, wrapGAppsHook, aria2 ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
libnotify
|
||||
libappindicator-gtk3
|
||||
gtk3
|
||||
(stdenv.lib.getLib gnome3.dconf)
|
||||
(stdenv.lib.getLib dconf)
|
||||
]
|
||||
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
|
||||
++ (stdenv.lib.optional (aria2 != null) aria2);
|
||||
|
@ -456,7 +456,7 @@ in
|
||||
findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
|
||||
|
||||
wrapGAppsHook = makeSetupHook {
|
||||
deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ];
|
||||
deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ];
|
||||
} ../build-support/setup-hooks/wrap-gapps-hook.sh;
|
||||
|
||||
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
|
||||
@ -1512,6 +1512,8 @@ in
|
||||
|
||||
datovka = libsForQt5.callPackage ../applications/networking/datovka { };
|
||||
|
||||
dconf = callPackage ../development/libraries/dconf { };
|
||||
|
||||
ddar = callPackage ../tools/backup/ddar { };
|
||||
|
||||
ddate = callPackage ../tools/misc/ddate { };
|
||||
@ -2438,9 +2440,7 @@ in
|
||||
|
||||
libkkc = callPackage ../tools/inputmethods/libkkc { };
|
||||
|
||||
ibus = callPackage ../tools/inputmethods/ibus {
|
||||
inherit (gnome3) dconf;
|
||||
};
|
||||
ibus = callPackage ../tools/inputmethods/ibus { };
|
||||
|
||||
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
|
||||
|
||||
@ -2461,9 +2461,7 @@ in
|
||||
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
|
||||
};
|
||||
|
||||
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
|
||||
inherit (gnome3) dconf;
|
||||
};
|
||||
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
|
||||
|
||||
table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese {
|
||||
ibus-table = ibus-engines.table;
|
||||
@ -2482,9 +2480,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
|
||||
inherit (gnome3) dconf;
|
||||
};
|
||||
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
|
||||
|
||||
interception-tools = callPackage ../tools/inputmethods/interception-tools { };
|
||||
interception-tools-plugins = {
|
||||
@ -13586,11 +13582,11 @@ in
|
||||
inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
bison = bison2; # error: too few arguments to function 'int yylex(...
|
||||
inherit cups;
|
||||
inherit dconf;
|
||||
inherit harfbuzz;
|
||||
inherit libGL;
|
||||
inherit perl;
|
||||
inherit gtk3;
|
||||
inherit (gnome3) dconf;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit llvmPackages_5;
|
||||
});
|
||||
@ -19025,9 +19021,7 @@ in
|
||||
|
||||
gmrun = callPackage ../applications/misc/gmrun {};
|
||||
|
||||
gnucash = callPackage ../applications/office/gnucash {
|
||||
inherit (gnome3) dconf;
|
||||
};
|
||||
gnucash = callPackage ../applications/office/gnucash { };
|
||||
|
||||
goffice = callPackage ../development/libraries/goffice { };
|
||||
|
||||
@ -19748,9 +19742,7 @@ in
|
||||
|
||||
lifelines = callPackage ../applications/misc/lifelines { };
|
||||
|
||||
liferea = callPackage ../applications/networking/newsreaders/liferea {
|
||||
inherit (gnome3) dconf;
|
||||
};
|
||||
liferea = callPackage ../applications/networking/newsreaders/liferea { };
|
||||
|
||||
lightworks = callPackage ../applications/video/lightworks {
|
||||
portaudio = portaudio2014;
|
||||
@ -19888,7 +19880,7 @@ in
|
||||
};
|
||||
|
||||
matchbox = callPackage ../applications/window-managers/matchbox { };
|
||||
|
||||
|
||||
matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli {
|
||||
inherit (python3Packages) buildPythonApplication buildPythonPackage
|
||||
pygobject3 pytestrunner requests responses pytest python-olm
|
||||
@ -20786,9 +20778,7 @@ in
|
||||
|
||||
quantomatic = callPackage ../applications/science/physics/quantomatic { };
|
||||
|
||||
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
|
||||
inherit (gnome3) dconf;
|
||||
};
|
||||
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
|
||||
|
||||
quasselClient = quassel.override {
|
||||
monolithic = false;
|
||||
@ -21660,7 +21650,6 @@ in
|
||||
virt-what = callPackage ../applications/virtualization/virt-what { };
|
||||
|
||||
virt-manager = callPackage ../applications/virtualization/virt-manager {
|
||||
dconf = gnome3.dconf;
|
||||
system-libvirt = libvirt;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user