gdk-pixbuf: rename from gdk_pixbuf
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user