mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 22:20:51 +00:00
Use $NIXPKGS_CONFIG to determine whether ghostscript has cups support.
svn path=/nixpkgs/trunk/; revision=14275
This commit is contained in:
parent
0175270bf9
commit
c7e3110299
|
@ -572,7 +572,7 @@ let
|
||||||
inherit stdenv fetchurl pkgconfig;
|
inherit stdenv fetchurl pkgconfig;
|
||||||
inherit (gtkLibs) glib;
|
inherit (gtkLibs) glib;
|
||||||
};
|
};
|
||||||
|
|
||||||
dev86 = import ../development/compilers/dev86 {
|
dev86 = import ../development/compilers/dev86 {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
@ -1216,7 +1216,7 @@ let
|
||||||
system_config_printer = import ../tools/misc/system-config-printer {
|
system_config_printer = import ../tools/misc/system-config-printer {
|
||||||
inherit stdenv fetchurl perl perlXMLParser autoconf automake intltool gettext desktop_file_utils;
|
inherit stdenv fetchurl perl perlXMLParser autoconf automake intltool gettext desktop_file_utils;
|
||||||
};
|
};
|
||||||
|
|
||||||
tcpdump = import ../tools/networking/tcpdump {
|
tcpdump = import ../tools/networking/tcpdump {
|
||||||
inherit fetchurl stdenv libpcap;
|
inherit fetchurl stdenv libpcap;
|
||||||
};
|
};
|
||||||
|
@ -2840,7 +2840,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) {
|
extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) {
|
||||||
inherit mesa tcl freeglut SDL SDL_mixer pkgconfig
|
inherit mesa tcl freeglut SDL SDL_mixer pkgconfig
|
||||||
libpng gettext intltool;
|
libpng gettext intltool;
|
||||||
inherit (xlibs) libX11 xproto libXi inputproto
|
inherit (xlibs) libX11 xproto libXi inputproto
|
||||||
libXmu libXext xextproto libXt libSM libICE;
|
libXmu libXext xextproto libXt libSM libICE;
|
||||||
|
@ -3332,7 +3332,7 @@ let
|
||||||
libical = import ../development/libraries/libical {
|
libical = import ../development/libraries/libical {
|
||||||
inherit stdenv fetchurl perl;
|
inherit stdenv fetchurl perl;
|
||||||
};
|
};
|
||||||
|
|
||||||
libQGLViewer = import ../development/libraries/libqglviewer {
|
libQGLViewer = import ../development/libraries/libqglviewer {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
inherit qt4;
|
inherit qt4;
|
||||||
|
@ -3404,7 +3404,7 @@ let
|
||||||
libmsn = import ../development/libraries/libmsn {
|
libmsn = import ../development/libraries/libmsn {
|
||||||
inherit stdenv fetchurl cmake openssl;
|
inherit stdenv fetchurl cmake openssl;
|
||||||
};
|
};
|
||||||
|
|
||||||
libmspack = import ../development/libraries/libmspack {
|
libmspack = import ../development/libraries/libmspack {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
@ -6184,7 +6184,7 @@ let
|
||||||
pycups = import ../development/python-modules/pycups {
|
pycups = import ../development/python-modules/pycups {
|
||||||
inherit stdenv fetchurl python cups;
|
inherit stdenv fetchurl python cups;
|
||||||
};
|
};
|
||||||
|
|
||||||
pygame = import ../development/python-modules/pygame {
|
pygame = import ../development/python-modules/pygame {
|
||||||
inherit fetchurl stdenv python pkgconfig SDL SDL_image
|
inherit fetchurl stdenv python pkgconfig SDL SDL_image
|
||||||
SDL_mixer SDL_ttf numeric;
|
SDL_mixer SDL_ttf numeric;
|
||||||
|
@ -6226,7 +6226,7 @@ let
|
||||||
pyqt4 = import ../development/python-modules/pyqt {
|
pyqt4 = import ../development/python-modules/pyqt {
|
||||||
inherit stdenv fetchurl python sip qt4;
|
inherit stdenv fetchurl python sip qt4;
|
||||||
};
|
};
|
||||||
|
|
||||||
pyx = import ../development/python-modules/pyx {
|
pyx = import ../development/python-modules/pyx {
|
||||||
inherit fetchurl stdenv python makeWrapper;
|
inherit fetchurl stdenv python makeWrapper;
|
||||||
};
|
};
|
||||||
|
@ -7677,7 +7677,7 @@ let
|
||||||
|
|
||||||
compizBase = composedArgsAndFun (assert mesaSupported; selectVersion ../applications/window-managers/compiz "0.8.0") {
|
compizBase = composedArgsAndFun (assert mesaSupported; selectVersion ../applications/window-managers/compiz "0.8.0") {
|
||||||
inherit lib builderDefs stringsWithDeps;
|
inherit lib builderDefs stringsWithDeps;
|
||||||
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext
|
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext
|
||||||
intltool;
|
intltool;
|
||||||
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
|
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
|
||||||
libXinerama libICE libSM libXrender xextproto compositeproto fixesproto
|
libXinerama libICE libSM libXrender xextproto compositeproto fixesproto
|
||||||
|
@ -9294,14 +9294,14 @@ let
|
||||||
inherit fetchurl stdenv libjpeg libpng libtiff zlib x11 pkgconfig
|
inherit fetchurl stdenv libjpeg libpng libtiff zlib x11 pkgconfig
|
||||||
fontconfig cups openssl;
|
fontconfig cups openssl;
|
||||||
x11Support = false;
|
x11Support = false;
|
||||||
cupsSupport = true;
|
cupsSupport = getPkgConfig "ghostscript" "cups" true;
|
||||||
};
|
};
|
||||||
|
|
||||||
ghostscriptX = lowPrio (appendToName "with-X" (import ../misc/ghostscript {
|
ghostscriptX = lowPrio (appendToName "with-X" (import ../misc/ghostscript {
|
||||||
inherit fetchurl stdenv libjpeg libpng libtiff zlib x11 pkgconfig
|
inherit fetchurl stdenv libjpeg libpng libtiff zlib x11 pkgconfig
|
||||||
fontconfig cups openssl;
|
fontconfig cups openssl;
|
||||||
x11Support = true;
|
x11Support = true;
|
||||||
cupsSupport = true;
|
cupsSupport = getPkgConfig "ghostscript" "cups" true;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
gxemul = (import ../misc/gxemul) {
|
gxemul = (import ../misc/gxemul) {
|
||||||
|
|
Loading…
Reference in a new issue