diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-24 16:44:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-24 16:44:25 -0400 |
commit | aabb651b23969ea4c901914db6ca34eb2897f7a0 (patch) | |
tree | e32ec7b9fc0d5c72f743df08c7b910cd7eeb0059 /pkgs/applications/graphics | |
parent | 23a3256ee1ece61eeb4e9a9a1fb6131b35e86abc (diff) | |
parent | 07bbae0bb721d84d8ffca4fef57e090130fe7c36 (diff) | |
download | nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.gz nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.bz2 nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.lz nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.xz nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.tar.zst nixlib-aabb651b23969ea4c901914db6ca34eb2897f7a0.zip |
Merge pull request #61876 from worldofpeace/gdk-pixbuf
gdk-pixbuf: rename from gdk_pixbuf
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/avocode/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/drawio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/giv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/mypaint/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/pencil/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/shutter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/viewnior/default.nix | 4 |
10 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 57631037cd0e..140548cd20ac 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -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 diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 70cf1c149ab1..4d5dbeb35b1a 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -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 diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 16b520fa7ed3..e3994b1b4128 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -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 diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index c5eb126cfbf7..ec708ad971a4 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -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"; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 36c7e7e2fb30..466ab3e26fb8 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index de7582710048..f622d3f388e2 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -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 diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index b244bed9294b..5991a3351ee1 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -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 diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 294737ee7335..79bc743fbf01 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -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 diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 18754b2b854b..527a21f93fe3 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -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" diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 5afd7a0237d0..48930ccbbb96 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -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 = '' |