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

Merge staging-next into master, closes #65497

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-08-03 07:42:50 +02:00
commit 53328909da
296 changed files with 1443 additions and 1035 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/x11/gdk-pixbuf.nix
View File

@ -5,21 +5,21 @@ with lib;
let
cfg = config.services.xserver.gdk-pixbuf;
# Get packages to generate the cache for. We always include gdk_pixbuf.
effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages);
# Get packages to generate the cache for. We always include gdk-pixbuf.
effectivePackages = unique ([pkgs.gdk-pixbuf] ++ cfg.modulePackages);
# Generate the cache file by running gdk-pixbuf-query-loaders for each
# package and concatenating the results.
loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } ''
(
for package in ${concatStringsSep " " effectivePackages}; do
module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}"
module_dir="$package/${pkgs.gdk-pixbuf.moduleDir}"
if [[ ! -d $module_dir ]]; then
echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2
continue
fi
GDK_PIXBUF_MODULEDIR="$module_dir" \
${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders
${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders
done
) > "$out"
'';

4
nixos/tests/gdk-pixbuf.nix
View File

@ -3,12 +3,12 @@ import ./make-test.nix ({ pkgs, ... }: {
name = "gdk-pixbuf";
meta = {
maintainers = pkgs.gdk_pixbuf.meta.maintainers;
maintainers = pkgs.gdk-pixbuf.meta.maintainers;
};
machine = { pkgs, ... }: {
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk-pixbuf.installedTests}/share" ];
# Tests allocate a lot of memory trying to exploit a CVE
# but qemu-system-i386 has a 2047M memory limit

2
nixos/tests/ostree.nix
View File

@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
];
environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk-pixbuf atk ]); # for GJS tests
};
testScript = ''

4
pkgs/applications/altcoins/exodus/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio }:
stdenv.mkDerivation rec {
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
gnome2.pango
atk
cairo
gdk_pixbuf
gdk-pixbuf
xorg.libX11
xorg.libxcb
xorg.libXcomposite

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

@ -1,11 +1,11 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
let
packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
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.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify

4
pkgs/applications/audio/amarok/default.nix
View File

@ -3,7 +3,7 @@
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver
, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
let
@ -29,7 +29,7 @@ in mkDerivation {
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
phonon plasma-framework threadweaver
curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
pcre snappy taglib taglib_extras
];

4
pkgs/applications/audio/audacious/qt-5.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
@ -45,7 +45,7 @@ mkDerivation {
qtbase
# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
libcdio libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack

4
pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
, libbsd, libjack2, libpng, ffmpeg
, libxkbcommon
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true; # we only want $gappsWrapperArgs here
buildInputs = with xorg; [
alsaLib bzip2.out cairo freetype gdk_pixbuf gtk2 gtk3 harfbuzz libX11 libXau
alsaLib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau
libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
libxkbfile pixman xcbutil xcbutilwm zlib
];

4
pkgs/applications/audio/cmusfm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk_pixbuf }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
stdenv.mkDerivation rec {
version = "2018-10-11";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# building
configureFlags = [ "--enable-libnotify" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ curl libnotify gdk_pixbuf ];
buildInputs = [ curl libnotify gdk-pixbuf ];
meta = with stdenv.lib; {
description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player";

4
pkgs/applications/audio/faust/faust2alsa.nix
View File

@ -4,7 +4,7 @@
, cairo
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, gtk2
, pango
@ -20,7 +20,7 @@ faust.wrapWithBuildEnv {
cairo
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gtk2
pango

4
pkgs/applications/audio/google-play-music-desktop-player/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
, fetchurl, GConf, gdk_pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
, nss, pango, udev, xorg
}:
@ -16,7 +16,7 @@ let
fontconfig
freetype
GConf
gdk_pixbuf
gdk-pixbuf
glib
gtk2
gtk3

4
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
libvorbis, gdk_pixbuf }:
libvorbis, gdk-pixbuf }:
stdenv.mkDerivation rec {
version = "2.1.5";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [
curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
gdl gnome3.adwaita-icon-theme gnome3.anjuta
] ++ (with perlPackages; [ perl XMLParser ]);

4
pkgs/applications/audio/mpg123/default.nix
View File

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "mpg123-1.25.10";
name = "mpg123-1.25.11";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc";
sha256 = "1cpal2zsm3zgi6f48vvwpg6wgkv42ndi7lk3zsg7sz52z83k61nz";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

4
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk_pixbuf,
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
gst_all_1, withGstPlugins ? true,
xineBackend ? false, xineLib,
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xineLib ] else with gst_all_1;
[ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);

4
pkgs/applications/audio/reaper/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoPatchelfHook, makeWrapper
, alsaLib, xorg
, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
, gtk3, pango, gdk-pixbuf, cairo, glib, freetype
, libpulseaudio, xdg_utils
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
xorg.libX11
xorg.libXi
gdk_pixbuf
gdk-pixbuf
pango
cairo
glib

4
pkgs/applications/audio/spotify/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
, at-spi2-atk, at-spi2-core, apulse
}:
@ -34,7 +34,7 @@ let
ffmpeg_3
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gtk2
libgcrypt

4
pkgs/applications/audio/transcribe/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk_pixbuf
{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf
, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }:
stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
dontPatchELF = true;
libPath = with gst_all_1; stdenv.lib.makeLibraryPath [
stdenv.cc.cc glib gtk3 atk pango cairo gdk_pixbuf alsaLib
stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib
libX11 libSM libpng12 gstreamer gst-plugins-base zlib
];

4
pkgs/applications/backup/crashplan/crashplan-small-business.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
postFixup = ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype
fontconfig dbus gconf nss nspr alsaLib cups expat udev
libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
libXext libXfixes libXrender libXtst libXScrnSaver]}"

4
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, pkgconfig
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk_pixbuf, clutter-gtk }:
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
stdenv.mkDerivation rec {
version = "0.2.1";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libX11
lightdm
libXdmcp
gdk_pixbuf
gdk-pixbuf
clutter-gtk
libxklavier
at-spi2-core

4
pkgs/applications/editors/atom/env.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret
}:
let
packages = [
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
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

4
pkgs/applications/editors/brackets/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
with stdenv.lib;
let
bracketsLibs = makeLibraryPath [
gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
];
in
stdenv.mkDerivation rec {

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

@ -1,12 +1,12 @@
{ 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, 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 gnome2.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

4
pkgs/applications/editors/rednotebook/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub
, gdk_pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
, pygobject3, pyyaml
}:
@ -20,7 +20,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ gobject-introspection ];
propagatedBuildInputs = [
gdk_pixbuf glib gtk3 gtksourceview pango webkitgtk
gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
pygobject3 pyyaml
];

4
pkgs/applications/editors/vim/common.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.1.1432";
version = "8.1.1547";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "0f8isi84dcmsfvvjzayys57zf4j56wngnpn9hfj0jn1z7x3vdbww";
sha256 = "01v35wq8wjrbzmdf5r02gp0sfa9yyfswsi3fqzn94cd68qhskkpr";
};
enableParallelBuilding = true;

4
pkgs/applications/graphics/avocode/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, fetchurl, unzip
, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath (with xorg; [
stdenv.cc.cc.lib
gdk_pixbuf
gdk-pixbuf
glib
gtk3
atk

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -2,7 +2,7 @@
# Dynamic libraries
, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat
, gdk_pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst
, libxcb, libuuid, nspr, nss, pango
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cups
dbus
expat
gdk_pixbuf
gdk-pixbuf
glib
gtk3
libX11

6
pkgs/applications/graphics/gimp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk-pixbuf, isocodes
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
buildInputs = [
babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
babl gegl gtk2 glib gdk-pixbuf pango cairo gexiv2 harfbuzz isocodes
freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
pythonPath = [ pygtk ];
# Check if librsvg was built with --disable-pixbuf-loader.
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}";
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
preConfigure = ''
# The check runs before glib-networking is registered

4
pkgs/applications/graphics/giv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib
{ stdenv, fetchFromGitHub, gdk-pixbuf, scons, pkgconfig, gtk2, glib
, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
patches = [ ./build.patch ];
nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
buildInputs = [ gdk-pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
meta = with stdenv.lib; {
description = "Cross platform image and hierarchical vector viewer based";

4
pkgs/applications/graphics/mypaint/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection, hicolor-icon-theme
, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
, gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
let
inherit (python2Packages) python pycairo pygobject3 numpy;
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
];
propagatedBuildInputs = [ numpy ];

4
pkgs/applications/graphics/pencil/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, makeWrapper,
# build dependencies
alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
glibc, systemd
}:
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk

4
pkgs/applications/graphics/rapid-photo-downloader/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, python3Packages
, file, intltool, gobject-introspection, libgudev
, udisks, gexiv2, gst_all_1, libnotify
, exiftool, gdk_pixbuf, libmediainfo, vmtouch
, exiftool, gdk-pixbuf, libmediainfo, vmtouch
}:
python3Packages.buildPythonApplication rec {
@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
# NOTE: Without gobject-introspection in buildInputs, launching fails with
# "Namespace [Notify / GExiv2 / GUdev] not available"
buildInputs = [
gdk_pixbuf
gdk-pixbuf
gexiv2
gobject-introspection
gst_all_1.gst-libav

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -24,7 +24,7 @@
, librest
, gettext
, desktop-file-utils
, gdk_pixbuf
, gdk-pixbuf
, librsvg
, wrapGAppsHook
, gobject-introspection
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
libraw
json-glib
glib
gdk_pixbuf
gdk-pixbuf
librsvg
librest
gcr

4
pkgs/applications/graphics/shutter/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg
, hicolor-icon-theme, procps
}:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perlPackages.perl procps gdk_pixbuf librsvg ] ++ perlModules;
buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg ] ++ perlModules;
installPhase = ''
mkdir -p "$out"

4
pkgs/applications/graphics/viewnior/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:
, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
stdenv.mkDerivation rec {
name = "viewnior-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
shared-mime-info glib gdk_pixbuf perl
shared-mime-info glib gdk-pixbuf perl
];
preFixup = ''

4
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
, gdk_pixbuf }:
, gdk-pixbuf }:
assert stdenv.hostPlatform.system == "i686-linux";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
# versions.
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ];
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ];
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";

4
pkgs/applications/misc/airtame/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype
, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
}:
let libPath = lib.makeLibraryPath [
alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk_pixbuf
alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk-pixbuf
glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXtst libpulseaudio libxcb

4
pkgs/applications/misc/batti/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl
, pkgconfig, gettext, pythonPackages
, gtk2, gdk_pixbuf, upower
, gtk2, gdk-pixbuf, upower
, makeWrapper }:
let
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ];
[ pkgconfig gettext python gtk2 pygtk dbus-python gdk-pixbuf upower makeWrapper ];
dontConfigure = true;

4
pkgs/applications/misc/dunst/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, pkgconfig, which, perl, libXrandr
, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
buildInputs = [
cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
cairo dbus gdk-pixbuf glib libX11 libXScrnSaver
libXinerama libnotify pango xorgproto librsvg libXrandr
];

4
pkgs/applications/misc/et/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
stdenv.mkDerivation rec {
name = "et-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
};
buildInputs = [ libnotify gdk_pixbuf ];
buildInputs = [ libnotify gdk-pixbuf ];
nativeBuildInputs = [ pkgconfig ];
installPhase = ''

4
pkgs/applications/misc/evilvte/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, makeWrapper, pkgconfig,
gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? ""
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkgconfig
];

4
pkgs/applications/misc/green-pdfviewer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }:
{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
stdenv.mkDerivation rec {
name = "green-pdfviewer-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ poppler gdk_pixbuf SDL gtk2 ];
buildInputs = [ poppler gdk-pixbuf SDL gtk2 ];
patches = [
./gdk-libs.patch

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

@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, 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, udev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 gnome2.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 udev libpulseaudio
];

4
pkgs/applications/misc/kiwix/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig
, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, xapian, ctpp2, zimlib
}:
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
--suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk-pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix PATH : ${aria2}/bin
'';

4
pkgs/applications/misc/lutris/default.nix
View File

@ -1,6 +1,6 @@
{ buildPythonApplication, lib, fetchFromGitHub
, wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango
, gdk_pixbuf, atk, webkitgtk, gst_all_1
, gdk-pixbuf, atk, webkitgtk, gst_all_1
, evdev, pyyaml, pygobject3, requests, pillow
, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma
, libstrangle, wine, fluidsynth, xorgserver
@ -42,7 +42,7 @@ in buildPythonApplication rec {
buildInputs = [
wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango
gdk_pixbuf atk webkitgtk
gdk-pixbuf atk webkitgtk
] ++ gstDeps;
makeWrapperArgs = [

4
pkgs/applications/misc/mako/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc
, systemd, pango, cairo, gdk_pixbuf
, systemd, pango, cairo, gdk-pixbuf
, wayland, wayland-protocols }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ];
buildInputs = [ systemd pango cairo gdk_pixbuf wayland ];
buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
mesonFlags = [ "-Dzsh-completions=true" ];

4
pkgs/applications/misc/mlterm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem
, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte
, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
, harfbuzz #substituting glyphs with opentype fonts
, fribidi, m17n_lib #bidi and encoding
, openssl, libssh2 #build-in ssh
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [
libX11 gdk_pixbuf.dev cairo libXft gtk3 vte
libX11 gdk-pixbuf.dev cairo libXft gtk3 vte
harfbuzz fribidi m17n_lib openssl libssh2
];

4
pkgs/applications/misc/navit/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2
, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib
, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango
, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango
, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc
, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper
, qtquickcontrols, qtmultimedia, qtspeech, qtsensors
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
gtk2 fontconfig freetype imlib2 libGLU_combined freeimage
libxslt libXmu freeglut python gettext quesoglc gd
fribidi pcre dbus dbus-glib librsvg shapelib glib
cairo gdk_pixbuf pango atk
cairo gdk-pixbuf pango atk
] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ]
++ optional postgresqlSupport postgresql
++ optional speechdSupport speechd

4
pkgs/applications/misc/plank/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
, wrapGAppsHook, autoreconfHook, pantheon }:
stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
atk
bamf
cairo
gdk_pixbuf
gdk-pixbuf
glib
gnome-menus
gnome3.dconf

10
pkgs/applications/misc/polar-bookshelf/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, makeWrapper, fetchurl
, dpkg, wrapGAppsHook, autoPatchelfHook
, gtk3, cairo, gnome2, atk, gdk_pixbuf, glib
, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib
, at-spi2-atk, dbus, libX11, libxcb, libXi
, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
cairo
gnome2.pango
atk
gdk_pixbuf
gdk-pixbuf
at-spi2-atk
dbus
libX11
@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
expat
];
nativeBuildInputs = [
nativeBuildInputs = [
wrapGAppsHook
autoPatchelfHook
makeWrapper
makeWrapper
dpkg
];
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
mv usr/share/* $out/share/
ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf
# Correct desktop file `Exec`
substituteInPlace $out/share/applications/polar-bookshelf.desktop \
--replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf"

4
pkgs/applications/misc/roxterm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat
, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme
, gsettings-desktop-schemas, gdk-pixbuf, gtk3, hicolor-icon-theme
, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper
, pkgconfig, python, pythonPackages, vte
, wrapGAppsHook}:
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
makeWrapper python pythonPackages.lockfile dbus dbus-glib
gdk_pixbuf gsettings-desktop-schemas gtk3
gdk-pixbuf gsettings-desktop-schemas gtk3
hicolor-icon-theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"

4
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft,
ncurses, perl, fontconfig, freetype, pkgconfig, libXrender,
gdkPixbufSupport ? true, gdk_pixbuf, unicode3Support ? true }:
gdkPixbufSupport ? true, gdk-pixbuf, unicode3Support ? true }:
let
pname = "rxvt-unicode";
@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
[ libX11 libXt libXft ncurses /* required to build the terminfo file */
fontconfig freetype pkgconfig libXrender ]
++ stdenv.lib.optional perlSupport perl
++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
++ stdenv.lib.optional gdkPixbufSupport gdk-pixbuf;
outputs = [ "out" "terminfo" ];

4
pkgs/applications/misc/safeeyes/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
}:
let inherit (python3Packages) python buildPythonApplication fetchPypi;
@ -50,7 +50,7 @@ in buildPythonApplication rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share"

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

@ -1,5 +1,5 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
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.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf

4
pkgs/applications/misc/stretchly/default.nix
View File

@ -8,7 +8,7 @@
, expat
, fetchurl
, fontconfig
, gdk_pixbuf
, gdk-pixbuf
, glib
, gtk2
, gtk3
@ -51,7 +51,7 @@ let
dbus
expat
fontconfig
gdk_pixbuf
gdk-pixbuf
glib
gtk2
gtk3

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, dpkg, gnome2, 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
@ -6,7 +6,7 @@
let
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
libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
];

4
pkgs/applications/misc/volnoti/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch
, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg
, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
, dbus-glib, autoreconfHook, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [
dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg
dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg
];
meta = with stdenv.lib; {

4
pkgs/applications/misc/xneur/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }:
, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
stdenv.mkDerivation rec {
name = "xneur-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib
xosd xorg.libXext xorg.libXi libnotify
enchant gdk_pixbuf
enchant gdk-pixbuf
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];

6
pkgs/applications/misc/xxkb/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep
, svgSupport ? false, librsvg, glib, gdk_pixbuf, pkgconfig
, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig
}:
assert svgSupport ->
librsvg != null && glib != null && gdk_pixbuf != null && pkgconfig != null;
librsvg != null && glib != null && gdk-pixbuf != null && pkgconfig != null;
stdenv.mkDerivation rec {
name = "xxkb-1.11.1";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [
libX11 libXt libXext libXpm
] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ];
outputs = [ "out" "man" ];

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -10,7 +10,7 @@
, expat
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, gnome2
, gnome3
@ -52,7 +52,7 @@ rpath = lib.makeLibraryPath [
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gtk3

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -9,7 +9,7 @@
, fontconfig
, freetype
, gconf
, gdk_pixbuf
, gdk-pixbuf
, glib
, glibc
, gtk2
@ -104,7 +104,7 @@ stdenv.mkDerivation {
fontconfig
freetype
gconf
gdk_pixbuf
gdk-pixbuf
glib
glibc
gtk2

4
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos
# command line arguments which are always set e.g "--disable-gpu"
@ -52,7 +52,7 @@ let
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsaLib libXdamage libXtst libXrandr expat cups
dbus gdk_pixbuf gcc-unwrapped.lib
dbus gdk-pixbuf gcc-unwrapped.lib
systemd
libexif
liberation_ttf curl utillinux xdg_utils wget

4
pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, gtk2, glib, gdk_pixbuf, dpkg, libXext, libXfixes
{ stdenv, fetchurl, xorg, gtk2, glib, gdk-pixbuf, dpkg, libXext, libXfixes
, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio
}:
@ -10,7 +10,7 @@ let
[gtk2 glib stdenv.cc.cc];
rpathPlugin = makeLibraryPath
([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk-pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
in

4
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -9,7 +9,7 @@
, expat
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, glibc
, graphite2
@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng

4
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -9,7 +9,7 @@
, expat
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, glibc
, graphite2
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng

4
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libGL, xorg, cairo
, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
, libpng, gtk2, glib, gdk-pixbuf, fontconfig, freetype, curl
, dbus-glib, alsaLib, libpulseaudio, systemd, pango
}:
@ -24,7 +24,7 @@ let
];
rpathProgram = makeLibraryPath
[ gdk_pixbuf
[ gdk-pixbuf
glib
gtk2
xorg.libX11

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

@ -9,7 +9,7 @@
, fetchurl
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, gnome2
, gtk3
@ -55,7 +55,7 @@ let
expat.out
fontconfig.lib
freetype.out
gdk_pixbuf.out
gdk-pixbuf.out
glib.out
gnome2.GConf
gtk3.out

4
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -12,7 +12,7 @@
, dbus-glib
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, gtk3
, libxcb
@ -67,7 +67,7 @@ let
dbus-glib
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gtk3
libxcb

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

@ -4,7 +4,7 @@
, freetype, fontconfig, libXft, libXrender, libxcb, expat
, libuuid
, gstreamer, gst-plugins-base, libxml2
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
, nss, nspr
, patchelf, makeWrapper
, isSnapshot ? false
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

4
pkgs/applications/networking/dropbox/cli.nix
View File

@ -6,7 +6,7 @@
, dropbox
, gtk3
, gnome3
, gdk_pixbuf
, gdk-pixbuf
, gobject-introspection
}:
@ -36,7 +36,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
pkgconfig
gobject-introspection
gdk_pixbuf
gdk-pixbuf
# only for build, the install command also wants to use GTK through introspection
# but we are using Nix for installation so we will not need that.
(python3.withPackages (ps: with ps; [

4
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus
, gtk2, atk, expat, gdk_pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
, gtk2, atk, expat, gdk-pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libPath =
stdenv.lib.makeLibraryPath
[ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk_pixbuf dbus udev.lib
[ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk-pixbuf dbus udev.lib
freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage
libXi libXext libXfixes libXcomposite alsaLib
];

4
pkgs/applications/networking/instant-messengers/coyim/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
buildGoPackage rec {
name = "coyim-${version}";
@ -14,7 +14,7 @@ buildGoPackage rec {
sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "a safe and secure chat client";

4
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon
, libnotify, libsoup, libgee
, libgcrypt
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
libgee
gnome3.adwaita-icon-theme
sqlite
gdk_pixbuf
gdk-pixbuf
gtk3
libnotify
gpgme

4
pkgs/applications/networking/instant-messengers/discord/base.nix
View File

@ -1,7 +1,7 @@
{ pname, version, src, binaryName, desktopName
, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk_pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath [
libcxx systemd libpulseaudio
stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
];

4
pkgs/applications/networking/instant-messengers/fractal/default.nix
View File

@ -19,7 +19,7 @@
, sqlite
, gst_all_1
, cairo
, gdk_pixbuf
, gdk-pixbuf
, gspell
, wrapGAppsHook
}:
@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
cairo
dbus
gdk_pixbuf
gdk-pixbuf
glib
gspell
gst_all_1.gst-editing-services

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
, xorg, atk, glib, pango, gdk-pixbuf, cairo, freetype, fontconfig, gtk3
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
];
runtimeDependencies = [ udev.lib libnotify ];

4
pkgs/applications/networking/instant-messengers/gitter/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, libX11
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
@ -12,7 +12,7 @@ let gitterDirectorySuffix = "opt/gitter";
$out/${gitterDirectorySuffix}/${target}
'';
libPath = stdenv.lib.makeLibraryPath [
alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib
alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib
gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd

4
pkgs/applications/networking/instant-messengers/linphone/default.nix
View File

@ -2,7 +2,7 @@
, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, polarssl
, python, graphviz, belcard
, withGui ? true
}:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard
bctoolbox libmatroska bcunit gdk-pixbuf glib cairo pango bzrtp belcard
];
nativeBuildInputs = [

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib,
{ stdenv, fetchurl, gnome2, gtk3, 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 }:
@ -12,7 +12,7 @@ let
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gtk3

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus
{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus
, dbus-glib }:
stdenv.mkDerivation rec {
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ];
buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ];
meta = {
homepage = https://github.com/novas0x2a/skype4pidgin;

6
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -4,14 +4,14 @@
, autoconf-archive
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk_pixbuf ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
, traySupport ? true, gnome2 ? null
, pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null
}:
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk_pixbuf != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
assert traySupport -> gnome2 != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
expect readline libuuid glib openssl expat ncurses libotr
curl libmesode cmocka libmicrohttpd stabber
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
++ optionals traySupport [ gnome2.gtk ]
++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ];

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
, gnome2, gtk3, atk, at-spi2-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, libnotify, libuuid
@ -31,7 +31,7 @@ let
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gtk3

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, 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, wrapGAppsHook, xorg
, at-spi2-atk }:
@ -25,7 +25,7 @@ let
libsecret
gnome2.GConf
gdk_pixbuf
gdk-pixbuf
gtk3
gnome3.gnome-keyring

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

@ -1,5 +1,5 @@
{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf,
libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
at-spi2-atk, libuuid, nodePackages
}:
@ -21,7 +21,7 @@ let
freetype
glib
gnome2.GConf
gdk_pixbuf
gdk-pixbuf
gtk3
pango
libnotify

4
pkgs/applications/networking/instant-messengers/stride/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
let
fullPath = stdenv.lib.makeLibraryPath [
alsaLib
@ -10,7 +10,7 @@ let
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk

4
pkgs/applications/networking/instant-messengers/toxic/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libsodium, ncurses, curl
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
, qrencode, gdk_pixbuf, libnotify }:
, qrencode, gdk-pixbuf, libnotify }:
stdenv.mkDerivation rec {
name = "toxic-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)"];
buildInputs = [
libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
libtoxcore libsodium ncurses curl gdk-pixbuf libnotify
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
openal libopus libvpx freealut qrencode
];

8
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem
, alsaLib, at-spi2-atk, atk, cairo, cups, dbus, dpkg, expat, fontconfig
, freetype, gdk_pixbuf, glib, gtk3, hunspell, libX11, libXScrnSaver
, freetype, gdk-pixbuf, glib, gtk3, hunspell, libX11, libXScrnSaver
, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr
, libXrender, libXtst, libnotify, libuuid, nspr, nss, pango, pciutils
, pulseaudio, udev, xdg_utils, xorg
@ -18,12 +18,12 @@ let
version = {
"x86_64-linux" = "3.9.2895";
"x86_64-darwin" = "3.9.2943";
}.${system} or "";
}.${system};
sha256 = {
"x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5";
"x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k";
}.${system} or "";
}.${system};
meta = with stdenv.lib; {
description = "A modern, secure messenger for everyone";
@ -71,7 +71,7 @@ let
nativeBuildInputs = [ dpkg ];
rpath = stdenv.lib.makeLibraryPath [
alsaLib at-spi2-atk atk cairo cups dbus expat fontconfig freetype
gdk_pixbuf glib gtk3 hunspell libX11 libXScrnSaver libXcomposite
gdk-pixbuf glib gtk3 hunspell libX11 libXScrnSaver libXcomposite
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst libnotify libuuid nspr nss pango pciutils pulseaudio
stdenv.cc.cc udev xdg_utils xorg.libxcb

4
pkgs/applications/networking/mailreaders/inboxer/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, binutils, patchelf, makeWrapper
, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
stdenv.mkDerivation rec {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
xorg.libXtst
xorg.libXScrnSaver
xorg.libxcb
gdk_pixbuf
gdk-pixbuf
glib
gnome2.pango
gnome2.GConf

4
pkgs/applications/networking/mailreaders/mailnag/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, gtk3, pythonPackages
, gdk_pixbuf, libnotify, gst_all_1
, gdk-pixbuf, libnotify, gst_all_1
, libgnome-keyring3
, wrapGAppsHook, gnome3
# otherwise passwords are stored unencrypted
@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec {
};
buildInputs = [
gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gnome3.adwaita-icon-theme

4
pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
View File

@ -10,7 +10,7 @@
, fontconfig
, freetype
, gcc-unwrapped
, gdk_pixbuf
, gdk-pixbuf
, glib
, gnome2
, libgnome-keyring
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
fontconfig
freetype
gcc-unwrapped
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk

4
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -10,7 +10,7 @@
, dbus
, fontconfig
, freetype
, gdk_pixbuf
, gdk-pixbuf
, glib
, glibc
, gst-plugins-base
@ -90,7 +90,7 @@ stdenv.mkDerivation {
dbus
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
glibc
gst-plugins-base

4
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, makeWrapper, fetchurl, dpkg
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk_pixbuf, glib, gnome2, pango, nspr, nss, gtk3
, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
, xorg, autoPatchelfHook, systemd, libnotify
}:
@ -13,7 +13,7 @@ let deps = [
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
pango

4
pkgs/applications/networking/p2p/tixati/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }:
{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
stdenv.mkDerivation rec {
name = "tixati-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \
--set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \
tixati
install -D tixati $out/bin/tixati
install -D tixati.desktop $out/share/applications/tixati.desktop

10
pkgs/applications/networking/p2p/transgui/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:
stdenv.mkDerivation rec {
pname = "transgui";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
unzip fpc lazarus stdenv.cc
libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl
libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
];
NIX_LDFLAGS = "
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
"INSTALL_PREFIX=$(out)"
];
LCL_PLATFORM = "gtk2";
LCL_PLATFORM = "gtk2";
desktopItem = makeDesktopItem rec {
name = "transgui";
@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/icons/hicolor/48x48/apps"
cp transgui.png "$out/share/icons/hicolor/48x48/apps"
mkdir -p "$out/share/transgui"
cp -r "./lang" "$out/share/transgui"
cp -r "./lang" "$out/share/transgui"
'';
meta = {
meta = {
description = "A cross platform front-end for the Transmission Bit-Torrent client";
homepage = https://sourceforge.net/p/transgui;
license = stdenv.lib.licenses.gpl2Plus;

4
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem
, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome }:
let
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [
atk cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
gnome2.gtkglext libGLU_combined freetype fontconfig
pangox_compat polkit polkit_gnome
] ++ (with xorg; [

6
pkgs/applications/networking/remote/citrix-receiver/default.nix
View File

@ -12,7 +12,7 @@
, glib
, gtk2
, atk
, gdk_pixbuf
, gdk-pixbuf
, cairo
, pango
, gnome3
@ -100,14 +100,14 @@ let
busybox
file
gtk2
gdk_pixbuf
gdk-pixbuf
];
libPath = stdenv.lib.makeLibraryPath [
glib
gtk2
atk
gdk_pixbuf
gdk-pixbuf
cairo
pango
gnome3.dconf

6
pkgs/applications/networking/remote/citrix-workspace/default.nix
View File

@ -12,7 +12,7 @@
, glib
, gtk2
, atk
, gdk_pixbuf
, gdk-pixbuf
, cairo
, pango
, gnome3
@ -103,14 +103,14 @@ let
busybox
file
gtk2
gdk_pixbuf
gdk-pixbuf
];
libPath = stdenv.lib.makeLibraryPath [
glib
gtk2
atk
gdk_pixbuf
gdk-pixbuf
cairo
pango
gnome3.dconf

6
pkgs/applications/networking/ssb/patchwork-classic/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, makeWrapper,
# build dependencies
alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
glibc, systemd
}:
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
expat
fontconfig
freetype
gdk_pixbuf
gdk-pixbuf
glib
gnome2.GConf
gnome2.gtk
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser";
homepage = "https://github.com/ssbc/patchwork-classic-electron";
license = licenses.gpl3;
license = licenses.gpl3;
maintainers = with maintainers; [ mrVanDalo ];
platforms = platforms.linux;
};

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
, gnome2, gtk3, gdk-pixbuf, libnotify, libxcb, nspr, nss, pango
, systemd, xorg, xprintidle-ng }:
let
@ -19,7 +19,7 @@ let
freetype
glib
gnome2.GConf
gdk_pixbuf
gdk-pixbuf
gtk3
pango
libnotify

4
pkgs/applications/office/moneyplex/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, patchelf, coreutils, pcsclite
, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl
, zlib, glib, gdk-pixbuf, gtk2, cairo, pango, libX11, atk, openssl
, runtimeShell }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib gdk_pixbuf gtk2 cairo pango libX11 atk openssl
stdenv.cc.cc zlib glib gdk-pixbuf gtk2 cairo pango libX11 atk openssl
];
src_i686 = {

4
pkgs/applications/office/pinpoint/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst
, gdk_pixbuf, cairo, clutter-gtk }:
, gdk-pixbuf, cairo, clutter-gtk }:
stdenv.mkDerivation rec {
name = "pinpoint-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf
buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf
cairo clutter-gtk ];
meta = with stdenv.lib; {

Some files were not shown because too many files have changed in this diff Show More