forked from mirrors/nixpkgs
One more bison inheritance fix
svn path=/nixpkgs/trunk/; revision=12713
This commit is contained in:
parent
956a4e1ed2
commit
988a1f1ef3
|
@ -29,6 +29,7 @@ rec {
|
||||||
ensureDir $out/share/stumpwm/lisp
|
ensureDir $out/share/stumpwm/lisp
|
||||||
|
|
||||||
cp stumpwm $out/bin
|
cp stumpwm $out/bin
|
||||||
|
cp contrib/stumpish $out/bin || true
|
||||||
cp sample-stumpwmrc.lisp $out/share/stumpwm/doc
|
cp sample-stumpwmrc.lisp $out/share/stumpwm/doc
|
||||||
cp stumpwm.info $out/share/info
|
cp stumpwm.info $out/share/info
|
||||||
|
|
||||||
|
|
|
@ -7151,7 +7151,7 @@ let pkgs = rec {
|
||||||
xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
|
xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
|
||||||
saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
|
saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
|
||||||
openbabel ocaml facile stdenv jasper fam indilib libnova
|
openbabel ocaml facile stdenv jasper fam indilib libnova
|
||||||
libarchive dbus;
|
libarchive dbus bison;
|
||||||
#flac = builtins.getAttr "1.1.2" flacAlts;
|
#flac = builtins.getAttr "1.1.2" flacAlts;
|
||||||
cdparanoia = cdparanoiaIII;
|
cdparanoia = cdparanoiaIII;
|
||||||
inherit (xlibs)
|
inherit (xlibs)
|
||||||
|
@ -7159,7 +7159,7 @@ let pkgs = rec {
|
||||||
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
|
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
|
||||||
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
|
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
|
||||||
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
|
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
|
||||||
libxkbfile libXinerama bison;
|
libxkbfile libXinerama;
|
||||||
inherit (gtkLibs) glib;
|
inherit (gtkLibs) glib;
|
||||||
qt = qt4;
|
qt = qt4;
|
||||||
openexr = openexr_1_6_1 ;
|
openexr = openexr_1_6_1 ;
|
||||||
|
|
Loading…
Reference in a new issue