xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
|
||||
{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
|
||||
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
|
||||
, libintlOrEmpty
|
||||
, # Whether to build no plugins that have external dependencies
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
# can't build alsaLib on darwin
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
|
||||
++ stdenv.lib.optionals (!minimalDeps)
|
||||
[ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango
|
||||
[ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango
|
||||
liboil ]
|
||||
# can't build cdparanoia on darwin
|
||||
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
|
||||
|
||||
Reference in New Issue
Block a user