From 28b6f74c3f4402156c6f3730d2ddad8cffcc3445 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Jul 2018 00:34:32 +0200 Subject: gnome3.gconf: remove --- pkgs/applications/altcoins/parity-ui/env.nix | 4 +-- pkgs/applications/editors/lighttable/default.nix | 4 +-- pkgs/applications/editors/typora/default.nix | 4 +-- pkgs/applications/misc/gksu/default.nix | 4 +-- pkgs/applications/misc/hyper/default.nix | 4 +-- pkgs/applications/misc/pdfmod/default.nix | 4 +-- pkgs/applications/misc/simplenote/default.nix | 4 +-- pkgs/applications/misc/terminus/default.nix | 4 +-- .../networking/browsers/opera/default.nix | 4 +-- .../networking/browsers/vivaldi/default.nix | 4 +-- .../instant-messengers/discord/default.nix | 4 +-- .../instant-messengers/franz/default.nix | 4 +-- .../mattermost-desktop/default.nix | 4 +-- .../instant-messengers/signal-desktop/default.nix | 4 +-- .../instant-messengers/skypeforlinux/default.nix | 4 +-- .../instant-messengers/slack/default.nix | 4 +-- .../instant-messengers/wire-desktop/default.nix | 6 ++-- .../networking/super-productivity/default.nix | 4 +-- pkgs/desktops/gnome-3/core/gconf/default.nix | 34 ---------------------- pkgs/desktops/gnome-3/default.nix | 4 --- pkgs/desktops/gnome-3/devtools/nemiver/default.nix | 30 ++++++++++++------- pkgs/desktops/gnome-3/games/aisleriot/default.nix | 21 ++++++++----- pkgs/games/planetaryannihilation/default.nix | 4 +-- pkgs/misc/gnash/default.nix | 8 ++--- .../networking/network-manager/fortisslvpn.nix | 2 +- .../networking/network-manager/openconnect.nix | 2 +- pkgs/top-level/all-packages.nix | 12 ++++---- 27 files changed, 85 insertions(+), 106 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/gconf/default.nix diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index a273bf33d1006..4068d4fb93004 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ @@ -9,7 +9,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret gnome3.gconf + xorg.libxcb libsecret gnome2.GConf ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index c5f8278f649d9..dfd6543c59853 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify +, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcursor diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 082bc2a2536c3..93ee70e4148bb 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango +{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo, pango , gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rpath = stdenv.lib.makeLibraryPath [ alsaLib - gnome3.gconf + gnome2.GConf gdk_pixbuf pango gnome3.defaultIconTheme diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index d4f2a056a9f6c..6adc805b72849 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, +{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 65b85868bc591..4903997611bcc 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 47be9dc8200ec..2c0d642863ed0 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena -, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook +, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --add-flags "$out/lib/pdfmod/PdfMod.exe" \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} ''; dontStrip = true; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 513c5facc6b2e..436d3ee4233e2 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: +, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf xorg.libxcb ]; diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index d2a2936680f98..f76f7035662b7 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs @@ -8,7 +8,7 @@ let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat libudev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 37ea44bb28d62..efbfee487c6d7 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -11,7 +11,7 @@ , freetype , gdk_pixbuf , glib -, gnome3 +, gnome2 , gtk3 , libX11 , libxcb @@ -55,7 +55,7 @@ let freetype.out gdk_pixbuf.out glib.out - gnome3.gconf + gnome2.GConf gtk3.out libX11.out libXScrnSaver.out diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8eae85099fb7c..14a8bfd048b4f 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr - gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf + gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ae0951ba99a17..09ead9b3de654 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gnome3, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage +, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [ libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gnome3.gconf gtk2 libnotify libX11 libXcomposite + gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index db3cafb355f60..b253e41ae7d85 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook , xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 -, gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { libXrender libX11 libXtst libXScrnSaver ]) ++ [ gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 60e883e8b9d18..a9ce8a96f9700 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gnome3, gtk2, pango, atk, cairo, gdk_pixbuf, glib, +{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: @@ -14,7 +14,7 @@ let freetype gdk_pixbuf glib - gnome3.gconf + gnome2.GConf gtk2 pango libX11 diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 89a3005b12790..48fcfa19d9765 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, wrapGAppsHook -, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev @@ -17,7 +17,7 @@ let freetype gdk_pixbuf glib - gnome3.gconf + gnome2.GConf gtk3 pango libX11 diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9ac3d870312d3..5899ca92eb0c9 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3 +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: let @@ -22,7 +22,7 @@ let glibc libsecret - gnome3.gconf + gnome2.GConf gdk_pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 32648ee34c907..7fedde2ad3ecf 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango , systemd, wget, xorg }: let @@ -18,7 +18,7 @@ let fontconfig freetype glib - gnome3.gconf + gnome2.GConf gdk_pixbuf gtk3 pango diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4e26d7683e690..0745836271ae5 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib +{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib , freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage , libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver , nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell @@ -15,7 +15,7 @@ let freetype gdk_pixbuf glib - gnome3.gconf + gnome2.GConf gtk2 pango hunspell @@ -93,7 +93,7 @@ in mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + meta = { description = "A modern, secure messenger"; homepage = https://wire.com/; diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 7c613a8a45a9b..80210d898b39d 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango , systemd, wget, xorg, xprintidle-ng }: let @@ -18,7 +18,7 @@ let fontconfig freetype glib - gnome3.gconf + gnome2.GConf gdk_pixbuf gtk3 pango diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix deleted file mode 100644 index 3e7ba45b03ae0..0000000000000 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, python, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus-glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - outputs = [ "out" "dev" ]; - - meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 6605d15a697ee..9d62bead40d41 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,10 +45,8 @@ lib.makeScope pkgs.newScope (self: with self; { easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; - inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; gtk = gtk3; gtkmm = gtkmm3; @@ -80,8 +78,6 @@ lib.makeScope pkgs.newScope (self: with self; { evolution-data-server = callPackage ./core/evolution-data-server { }; - gconf = callPackage ./core/gconf { }; - geocode-glib = callPackage ./core/geocode-glib { }; gcr = callPackage ./core/gcr { }; # ToDo: tests fail diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index 4cd5cce272da6..e626d293f83a6 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, - boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, + boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas, gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -11,23 +11,34 @@ stdenv.mkDerivation rec { sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; }; - }; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop - glibmm gtkmm vte gtksourceview gtksourceviewmm ]; + buildInputs = [ + gtk3 gdb boost sqlite libgtop + glibmm gtkmm vte gtksourceview gtksourceviewmm + gsettings-desktop-schemas + ]; patches = [ - ./bool_slot.patch ./safe_ptr.patch + ./bool_slot.patch + ./safe_ptr.patch (fetchpatch { url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; }) ]; + configureFlags = [ + "--enable-gsettings" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "nemiver"; + attrPath = "gnome3.nemiver"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Nemiver; description = "Easy to use standalone C/C++ debugger"; @@ -36,4 +47,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 77220124fcc1e..a54c336326abc 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils +, wrapGAppsHook, librsvg, libxml2, desktop-file-utils , guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { @@ -11,15 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; }; - }; + configureFlags = [ + "--with-card-theme-formats=svg" + "--with-platform=gtk-only" # until they remove GConf + ]; - configureFlags = [ "--with-card-theme-formats=svg" ]; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ]; + buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "aisleriot"; + attrPath = "gnome3.aisleriot"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 451d4b71296a2..95674822aa36d 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,5 +1,5 @@ { stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk -, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: +, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out assert ((config.planetary_annihilation or null).url or null) != null; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index c0b86336163dd..8aeabebbefeaf 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -9,7 +9,7 @@ , enableOpenGL ? false, libGLU_combined ? null # GUI toolkits -, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null +, enableGTK ? true, gtk2 ? null, gnome2 ? null , enableSDL ? false , enableQt ? false, qt4 ? null @@ -27,7 +27,7 @@ with stdenv.lib; -let +let available = x: x != null; sound = @@ -52,7 +52,7 @@ assert enableCairo -> available cairo; assert enableOpenGL -> available libGLU_combined; # GUI toolkits -assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ]; +assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; assert enableSDL -> available SDL; assert enableQt -> available qt4; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ++ optional enableJemalloc jemalloc ++ optional enableHwAccel libGLU_combined ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ] + ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ] ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; configureFlags = with stdenv.lib; [ diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 73aaea06c9176..f7bb82e90dd9f 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 27fd4c4adc308..ad15723dd3310 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee738475257d..0a8475e9b2d88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1767,7 +1767,8 @@ with pkgs; }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf gconf glib; + gconf = gnome2.GConf; + inherit (gnome3) dconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -12888,7 +12889,7 @@ with pkgs; }; pulseaudioFull = pulseaudio.override { - gconf = gnome3.gconf; + gconf = gnome2.GConf; x11Support = true; jackaudioSupport = true; airtunesSupport = true; @@ -15290,7 +15291,7 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; - brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; + brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; @@ -20142,7 +20143,8 @@ with pkgs; mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gconf gsettings-desktop-schemas; + inherit (gnome3) gsettings-desktop-schemas; + gconf = gnome2.GConf; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); @@ -20947,7 +20949,7 @@ with pkgs; cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; crashplan = callPackage ../applications/backup/crashplan { }; - crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; }; + crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; }; colort = callPackage ../applications/misc/colort { }; -- cgit 1.4.1