public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge: xlibs and x11 attribute cleanup

Browse Source 
Frequently using multiple *almost* identical attributes is bad.
This commit is contained in:
Vladimír Čunát
2015-09-23 10:42:34 +02:00
parent 6b0add86b9 eb09b1fd85
commit 76ef7a93e3
192 changed files with 566 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+2 -2
View File
@@ -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.xlibs 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