b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnome3.gconf: remove

Browse source
This commit is contained in:
Jan Tojnar 2018-07-10 00:34:32 +02:00
parent 373bdced7f
commit 28b6f74c3f
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
27 changed files with 85 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/altcoins/parity-ui/env.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , 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 let
packages = [ packages = [
@ -9,7 +9,7 @@ let
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
xorg.libxcb libsecret gnome3.gconf xorg.libxcb libsecret gnome2.GConf
]; ];
libPathNative = lib.makeLibraryPath packages; libPathNative = lib.makeLibraryPath packages;

4
pkgs/applications/editors/lighttable/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf , 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 let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss 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.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
xorg.libXcursor xorg.libXcursor

4
pkgs/applications/editors/typora/default.nix
View file

@ -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 }: , gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
alsaLib alsaLib
gnome3.gconf gnome2.GConf
gdk_pixbuf gdk_pixbuf
pango pango
gnome3.defaultIconTheme gnome3.defaultIconTheme

4
pkgs/applications/misc/gksu/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, { stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu,
intltool, libstartup_notification, gtk-doc, wrapGAppsHook intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/misc/hyper/default.nix
View file

@ -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 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: , libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
let let
libPath = stdenv.lib.makeLibraryPath [ 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 libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
]; ];

4
pkgs/applications/misc/pdfmod/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib { stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib
, mono, gtk-sharp-2_0, gnome-sharp, hyena , mono, gtk-sharp-2_0, gnome-sharp, hyena
, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook , which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
--add-flags "$out/lib/pdfmod/PdfMod.exe" \ --add-flags "$out/lib/pdfmod/PdfMod.exe" \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
--prefix MONO_GAC_PREFIX : ${gnome-sharp} \ --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; dontStrip = true;

4
pkgs/applications/misc/simplenote/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , 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 { stdenv.mkDerivation rec {
@ -19,7 +19,7 @@
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr 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 xorg.libxcb
]; ];

4
pkgs/applications/misc/terminus/default.nix
View file

@ -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 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs , libxcb, makeWrapper, nodejs
@ -8,7 +8,7 @@ let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/networking/browsers/opera/default.nix
View file

@ -11,7 +11,7 @@
, freetype , freetype
, gdk_pixbuf , gdk_pixbuf
, glib , glib
, gnome3 , gnome2
, gtk3 , gtk3
, libX11 , libX11
, libxcb , libxcb
@ -55,7 +55,7 @@ let
freetype.out freetype.out
gdk_pixbuf.out gdk_pixbuf.out
glib.out glib.out
gnome3.gconf gnome2.GConf
gtk3.out gtk3.out
libX11.out libX11.out
libXScrnSaver.out libXScrnSaver.out

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -4,7 +4,7 @@
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz , libuuid, xz
, gstreamer, gst-plugins-base, libxml2 , 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 , nss, nspr
, patchelf, makeWrapper , patchelf, makeWrapper
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr 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; ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
libPath = stdenv.lib.makeLibraryPath buildInputs libPath = stdenv.lib.makeLibraryPath buildInputs

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper { stdenv, fetchurl, makeDesktopItem, makeWrapper
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf , 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 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
libcxx systemd libpulseaudio libcxx systemd libpulseaudio
stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype 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 libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver libXtst nspr nss libxcb pango systemd libXScrnSaver
]; ];

4
pkgs/applications/networking/instant-messengers/franz/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 , 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 let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
libXrender libX11 libXtst libXScrnSaver libXrender libX11 libXtst libXScrnSaver
]) ++ [ ]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 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 ]; runtimeDependencies = [ udev.lib libnotify ];

4
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View file

@ -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, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
@ -14,7 +14,7 @@ let
freetype freetype
gdk_pixbuf gdk_pixbuf
glib glib
gnome3.gconf gnome2.GConf
gtk2 gtk2
pango pango
libX11 libX11

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook { 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 , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
, cups, expat, udev , cups, expat, udev
@ -17,7 +17,7 @@ let
freetype freetype
gdk_pixbuf gdk_pixbuf
glib glib
gnome3.gconf gnome2.GConf
gtk3 gtk3
pango pango
libX11 libX11

4
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper { 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 }: , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
let let
@ -22,7 +22,7 @@ let
glibc glibc
libsecret libsecret
gnome3.gconf gnome2.GConf
gdk_pixbuf gdk_pixbuf
gtk3 gtk3

4
pkgs/applications/networking/instant-messengers/slack/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper { stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , 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 }: , systemd, wget, xorg }:
let let
@ -18,7 +18,7 @@ let
fontconfig fontconfig
freetype freetype
glib glib
gnome3.gconf gnome2.GConf
gdk_pixbuf gdk_pixbuf
gtk3 gtk3
pango pango

6
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View file

@ -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 , freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver , libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell , nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
@ -15,7 +15,7 @@ let
freetype freetype
gdk_pixbuf gdk_pixbuf
glib glib
gnome3.gconf gnome2.GConf
gtk2 gtk2
pango pango
hunspell hunspell
@ -93,7 +93,7 @@ in
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
''; '';
meta = { meta = {
description = "A modern, secure messenger"; description = "A modern, secure messenger";
homepage = https://wire.com/; homepage = https://wire.com/;

4
pkgs/applications/networking/super-productivity/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper { stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , 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 }: , systemd, wget, xorg, xprintidle-ng }:
let let
@ -18,7 +18,7 @@ let
fontconfig fontconfig
freetype freetype
glib glib
gnome3.gconf gnome2.GConf
gdk_pixbuf gdk_pixbuf
gtk3 gtk3
pango pango

34
pkgs/desktops/gnome-3/core/gconf/default.nix
View file

@ -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;
};
}

4
pkgs/desktops/gnome-3/default.nix
View file

@ -45,10 +45,8 @@ lib.makeScope pkgs.newScope (self: with self; {
easytag meld orca rhythmbox shotwell gnome-usage easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
orbit = ORBit2;
gnome3 = self // { recurseForDerivations = false; }; gnome3 = self // { recurseForDerivations = false; };
gtk = gtk3; gtk = gtk3;
gtkmm = gtkmm3; gtkmm = gtkmm3;
@ -80,8 +78,6 @@ lib.makeScope pkgs.newScope (self: with self; {
evolution-data-server = callPackage ./core/evolution-data-server { }; evolution-data-server = callPackage ./core/evolution-data-server { };
gconf = callPackage ./core/gconf { };
geocode-glib = callPackage ./core/geocode-glib { }; geocode-glib = callPackage ./core/geocode-glib { };
gcr = callPackage ./core/gcr { }; # ToDo: tests fail gcr = callPackage ./core/gcr { }; # ToDo: tests fail

30
pkgs/desktops/gnome-3/devtools/nemiver/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, { 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 }: gtksourceviewmm, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,23 +11,34 @@ stdenv.mkDerivation rec {
sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
}; };
passthru = { nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ];
updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; };
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [
gtk3 gdb boost sqlite libgtop
buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop glibmm gtkmm vte gtksourceview gtksourceviewmm
glibmm gtkmm vte gtksourceview gtksourceviewmm ]; gsettings-desktop-schemas
];
patches = [ patches = [
./bool_slot.patch ./safe_ptr.patch ./bool_slot.patch
./safe_ptr.patch
(fetchpatch { (fetchpatch {
url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
}) })
]; ];
configureFlags = [
"--enable-gsettings"
];
passthru = {
updateScript = gnome3.updateScript {
packageName = "nemiver";
attrPath = "gnome3.nemiver";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Nemiver; homepage = https://wiki.gnome.org/Apps/Nemiver;
description = "Easy to use standalone C/C++ debugger"; description = "Easy to use standalone C/C++ debugger";
@ -36,4 +47,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.juliendehos ]; maintainers = [ maintainers.juliendehos ];
}; };
} }

21
pkgs/desktops/gnome-3/games/aisleriot/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 { 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 }: , guile_2_0, libcanberra-gtk3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,16 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh"; sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
}; };
configureFlags = [
"--with-card-theme-formats=svg"
"--with-platform=gtk-only" # until they remove GConf
];
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ];
buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ];
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; }; updateScript = gnome3.updateScript {
packageName = "aisleriot";
attrPath = "gnome3.aisleriot";
};
}; };
configureFlags = [ "--with-card-theme-formats=svg" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf
librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Aisleriot; homepage = https://wiki.gnome.org/Apps/Aisleriot;
description = "A collection of patience games written in guile scheme"; description = "A collection of patience games written in guile scheme";

4
pkgs/games/planetaryannihilation/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk { 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 # TODO: use dynamic attributes once Nix 1.7 is out
assert ((config.planetary_annihilation or null).url or null) != null; 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 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)" "$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" 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"

8
pkgs/misc/gnash/default.nix
View file

@ -9,7 +9,7 @@
, enableOpenGL ? false, libGLU_combined ? null , enableOpenGL ? false, libGLU_combined ? null
# GUI toolkits # GUI toolkits
, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null , enableGTK ? true, gtk2 ? null, gnome2 ? null
, enableSDL ? false , enableSDL ? false
, enableQt ? false, qt4 ? null , enableQt ? false, qt4 ? null
@ -27,7 +27,7 @@
with stdenv.lib; with stdenv.lib;
let let
available = x: x != null; available = x: x != null;
sound = sound =
@ -52,7 +52,7 @@ assert enableCairo -> available cairo;
assert enableOpenGL -> available libGLU_combined; assert enableOpenGL -> available libGLU_combined;
# GUI toolkits # 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 enableSDL -> available SDL;
assert enableQt -> available qt4; assert enableQt -> available qt4;
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
++ optional enableJemalloc jemalloc ++ optional enableJemalloc jemalloc
++ optional enableHwAccel libGLU_combined ++ optional enableHwAccel libGLU_combined
++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ 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 ]; ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
configureFlags = with stdenv.lib; [ configureFlags = with stdenv.lib; [

2
pkgs/tools/networking/network-manager/fortisslvpn.nix
View file

@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
}; };
buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] 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 ]; nativeBuildInputs = [ automake autoconf intltool pkgconfig ];

2
pkgs/tools/networking/network-manager/openconnect.nix
View file

@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
}; };
buildInputs = [ openconnect networkmanager libsecret ] 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 ]; nativeBuildInputs = [ intltool pkgconfig ];

12
pkgs/top-level/all-packages.nix
View file

@ -1767,7 +1767,8 @@ with pkgs;
}; };
ibus = callPackage ../tools/inputmethods/ibus { 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 { }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
@ -12888,7 +12889,7 @@ with pkgs;
}; };
pulseaudioFull = pulseaudio.override { pulseaudioFull = pulseaudio.override {
gconf = gnome3.gconf; gconf = gnome2.GConf;
x11Support = true; x11Support = true;
jackaudioSupport = true; jackaudioSupport = true;
airtunesSupport = true; airtunesSupport = true;
@ -15290,7 +15291,7 @@ with pkgs;
bonzomatic = callPackage ../applications/editors/bonzomatic { }; 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 { }; notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
@ -20142,7 +20143,8 @@ with pkgs;
mkPlasma5 = import ../desktops/plasma-5; mkPlasma5 = import ../desktops/plasma-5;
attrs = { attrs = {
inherit libsForQt5 lib fetchurl; inherit libsForQt5 lib fetchurl;
inherit (gnome3) gconf gsettings-desktop-schemas; inherit (gnome3) gsettings-desktop-schemas;
gconf = gnome2.GConf;
}; };
in in
recurseIntoAttrs (makeOverridable mkPlasma5 attrs); recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
@ -20947,7 +20949,7 @@ with pkgs;
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
crashplan = callPackage ../applications/backup/crashplan { }; 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 { }; colort = callPackage ../applications/misc/colort { };