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
@@ -17,7 +17,7 @@ sourcePerArch:
, cairo
, alsaLib
, atk
, gdk_pixbuf
, gdk-pixbuf
, zlib
, elfutils
}:
@@ -35,7 +35,7 @@ let
libraries = [
stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf
xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf
atk zlib elfutils
] ++ (stdenv.lib.optionals swingSupport [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
@@ -1,6 +1,6 @@
{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
, gcc48, gcc49, gcc5, gcc6, gcc7
, xorg, gtk2, gdk_pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
, xorg, gtk2, gdk-pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
, addOpenGLRunpath
}:
@@ -41,7 +41,7 @@ let
outputs = [ "out" "lib" "doc" ];
nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
buildInputs = [ gdk_pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
runtimeDependencies = [
ncurses5 expat python zlib glibc
xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, glib, git,
rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
pango, cairo, gtk2, gdk_pixbuf, gtkglext,
pango, cairo, gtk2, gdk-pixbuf, gtkglext,
mesa, xorg, openssl, unzip }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
libX11 pango cairo gtk2 gdk_pixbuf gtkglext
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
mesa libXmu libXt libICE libSM openssl unzip ];
buildPhase = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
# will work only on the known libraries. There does not seem
# to be a generic solution here.
find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext
mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
(echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
cp ./factor $out/bin
wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
"${stdenv.lib.makeLibraryPath (with xorg; [ glib
libX11 pango cairo gtk2 gdk_pixbuf gtkglext
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
mesa libXmu libXt libICE libSM openssl])}"
sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
, fpc, gtk2, glib, pango, atk, gdk_pixbuf
, fpc, gtk2, glib, pango, atk, gdk-pixbuf
, libXi, xorgproto, libX11, libXext
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
fpc gtk2 glib libXi xorgproto
libX11 libXext pango atk
stdenv.cc makeWrapper gdk_pixbuf
stdenv.cc makeWrapper gdk-pixbuf
];
makeFlags = [
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
, gdk_pixbuf, atk, zlib }:
, gdk-pixbuf, atk, zlib }:
# TODO: Investigate building from source instead of patching binaries.
# TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
@@ -38,7 +38,7 @@ let drv = stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath ([
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib
alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
(placeholder "out")
] ++ (with xorg; [
libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
@@ -32,7 +32,7 @@
, cairo
, alsaLib
, atk
, gdk_pixbuf
, gdk-pixbuf
, setJavaClassPath
}:
@@ -183,7 +183,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64
*/
libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries;
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
, swingSupport ? true }:
let
@@ -17,7 +17,7 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk
gnome2.gtk cairo gdk-pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
, swingSupport ? true }:
let
@@ -17,7 +17,7 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk zlib
gnome2.gtk cairo gdk-pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc