gdk-pixbuf: rename from gdk_pixbuf

This commit is contained in:
worldofpeace
2019-07-22 18:50:57 -04:00
parent 23a3256ee1
commit b1bc0645ea
246 changed files with 581 additions and 581 deletions
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
, withGTK ? false, gtk3 ? null
, vala, gobject-introspection }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
propagatedBuildInputs = [ glib gdk-pixbuf cairo ] ++ lib.optional withGTK gtk3;
nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
-i gdk-pixbuf-loader/Makefile
# Fix thumbnailer path
sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk_pixbuf}/bin\1#g" \
sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \
-i gdk-pixbuf-loader/librsvg.thumbnailer.in
'';
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
# Merge gdkpixbuf and librsvg loaders
postInstall = ''
mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
cat ${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
cat ${gdk-pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
rm $GDK_PIXBUF/loaders.cache.tmp
'';