diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-02-02 21:40:18 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-02-02 21:40:18 +0000 |
commit | 9d9c76529fb828f632b02d30d5a1961bbfd49a01 (patch) | |
tree | cf86aea504498a5bf2869ea98ee99dc368deb051 /pkgs | |
parent | 3f6bf521fc77b663d1c56adfad8a21684884b6e4 (diff) |
* Use the `inherit' syntax.
svn path=/nixpkgs/trunk/; revision=740
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 9 | ||||
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 551 |
2 files changed, 136 insertions, 424 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 5c527f134d745..3e2469513ecd1 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -22,16 +22,11 @@ derivation { md5 = "048c4d17d5880dc8f3699020eac56224"; }; - localServer = localServer; - httpServer = httpServer; - sslSupport = sslSupport; - swigBindings = swigBindings; - - stdenv = stdenv; openssl = if sslSupport then openssl else null; httpd = if httpServer then httpd else null; - expat = expat; db4 = if localServer then db4 else null; swig = if swigBindings then swig else null; python = if swigBindings then swig.python else null; + + inherit stdenv expat localServer httpServer sslSupport swigBindings; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 9e9aa9099dffe..2a95f59b8a091 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -4,166 +4,130 @@ {system, stdenv}: rec { - # Hack: remember stdenv. - stdenv_ = stdenv; + inherit stdenv; ### BUILD SUPPORT fetchurl = (import ../build-support/fetchurl) { - stdenv = stdenv; + inherit stdenv; }; fetchsvn = (import ../build-support/fetchsvn) { - stdenv = stdenv; - subversion = subversion; + inherit stdenv subversion; }; ### TOOLS coreutils = (import ../tools/misc/coreutils) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; findutils = (import ../tools/misc/findutils) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; getopt = (import ../tools/misc/getopt) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; diffutils = (import ../tools/text/diffutils) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gnused = (import ../tools/text/gnused) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gnugrep = (import ../tools/text/gnugrep) { - fetchurl = fetchurl; - stdenv = stdenv; - pcre = pcre; + inherit fetchurl stdenv pcre; }; gawk = (import ../tools/text/gawk) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; ed = (import ../tools/text/ed) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gnutar = (import ../tools/archivers/gnutar) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; zip = (import ../tools/archivers/zip) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; unzip = (import ../tools/archivers/unzip) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gzip = (import ../tools/compression/gzip) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; bzip2 = (import ../tools/compression/bzip2) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; which = (import ../tools/system/which) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; wget = (import ../tools/networking/wget) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; par2cmdline = (import ../tools/networking/par2cmdline) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; cksfv = (import ../tools/networking/cksfv) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; graphviz = (import ../tools/graphics/graphviz) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv libpng libjpeg expat; x11 = xfree86; - libpng = libpng; - libjpeg = libjpeg; - expat = expat; }; ### SHELLS bash = (import ../shells/bash) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; ### DEVELOPMENT binutils = (import ../development/tools/misc/binutils) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gnum4 = (import ../development/tools/misc/gnum4) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; autoconf = (import ../development/tools/misc/autoconf) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv perl; m4 = gnum4; - perl = perl; }; autoconflibtool = (import ../development/tools/misc/autoconf/autoconf-libtool.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv perl; m4 = gnum4; - perl = perl; }; automake = (import ../development/tools/misc/automake) { - fetchurl = fetchurl; - stdenv = stdenv; - perl = perl; - autoconf = autoconf; + inherit fetchurl stdenv perl autoconf; }; libtool = (import ../development/tools/misc/libtool) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv perl; m4 = gnum4; - perl = perl; }; autotools = { @@ -174,163 +138,129 @@ }; pkgconfig = (import ../development/tools/misc/pkgconfig) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; swig = (import ../development/tools/misc/swig) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv perl python; perlSupport = true; pythonSupport = true; - perl = perl; - python = python; }; valgrind = (import ../development/tools/misc/valgrind) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gnumake = (import ../development/tools/build-managers/gnumake) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; bison = (import ../development/tools/parsing/bison) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; m4 = gnum4; }; bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; m4 = gnum4; }; flex = (import ../development/tools/parsing/flex) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; yacc = bison; }; flexnew = (import ../development/tools/parsing/flex/flex-new.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; yacc = bison; m4 = gnum4; }; gcc = (import ../development/compilers/gcc) { - fetchurl = fetchurl; - stdenv = stdenv; - binutils = binutils; + inherit fetchurl stdenv binutils; }; perl = (import ../development/interpreters/perl) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; python = (import ../development/interpreters/python) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; python = (import ../development/interpreters/python) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; j2re = (import ../development/interpreters/j2re) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; jikes = (import ../development/compilers/jikes) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; j2sdk = (import ../development/compilers/j2sdk) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; apacheant = (import ../development/tools/build-managers/apache-ant) { - fetchurl = fetchurl; - stdenv = stdenv; - j2sdk = j2sdk; + inherit fetchurl stdenv j2sdk; }; pcre = (import ../development/libraries/pcre) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; glibc = (import ../development/libraries/glibc) { - fetchurl = fetchurl; - stdenv = stdenv; - kernelHeaders = kernelHeaders; + inherit fetchurl stdenv kernelHeaders; }; aterm = (import ../development/libraries/aterm) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; aterm_2_0_5 = (import ../development/libraries/aterm/aterm-2.0.5.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; sdf2 = (import ../development/tools/parsing/sdf2) { - fetchurl = fetchurl; - stdenv = stdenv; - aterm = aterm; - getopt = getopt; + inherit fetchurl stdenv aterm getopt; }; toolbuslib_0_5_1 = (import ../development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; aterm = aterm_2_0_5; }; ptsupport_1_0 = (import ../development/tools/parsing/pt-support/pt-support-1.0.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; aterm = aterm_2_0_5; toolbuslib = toolbuslib_0_5_1; }; sdfsupport_2_0 = (import ../development/tools/parsing/sdf-support/sdf-support-2.0.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; aterm = aterm_2_0_5; toolbuslib = toolbuslib_0_5_1; ptsupport = ptsupport_1_0; }; sglr_3_10_2 = (import ../development/tools/parsing/sglr/sglr-3.10.2.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; aterm = aterm_2_0_5; toolbuslib = toolbuslib_0_5_1; ptsupport = ptsupport_1_0; }; asfsupport_1_2 = (import ../development/tools/parsing/asf-support/asf-support-1.2.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; aterm = aterm_2_0_5; ptsupport = ptsupport_1_0; }; ascsupport_1_8 = (import ../development/tools/parsing/asc-support/asc-support-1.8.nix) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; aterm = aterm_2_0_5; toolbuslib = toolbuslib_0_5_1; ptsupport = ptsupport_1_0; @@ -338,9 +268,7 @@ }; pgen_2_0 = (import ../development/tools/parsing/pgen/pgen-2.0.nix) { - fetchurl = fetchurl; - stdenv = stdenv; - getopt = getopt; + inherit fetchurl stdenv getopt; aterm = aterm_2_0_5; toolbuslib = toolbuslib_0_5_1; ptsupport = ptsupport_1_0; @@ -351,321 +279,189 @@ }; strategoxt = (import ../development/compilers/strategoxt) { - fetchurl = fetchurl; - stdenv = stdenv; - aterm = aterm; + inherit fetchurl stdenv aterm; sdf = sdf2; }; strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) { - fetchsvn = fetchsvn; - stdenv = stdenv; - autotools = autotools; - which = which; - aterm = aterm; + inherit fetchsvn stdenv autotools which aterm; sdf = sdf2; }; strategoxt093 = (import ../development/compilers/strategoxt/strategoxt-0.9.3.nix) { - fetchurl = fetchurl; - stdenv = stdenv; - aterm = aterm; + inherit fetchurl stdenv aterm; sdf = sdf2; }; tiger = (import ../development/compilers/tiger) { - fetchurl = fetchurl; - stdenv = stdenv; - aterm = aterm; + inherit fetchurl stdenv aterm strategoxt; sdf = sdf2; - strategoxt = strategoxt; }; expat = (import ../development/libraries/expat) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; libxml2 = (import ../development/libraries/libxml2) { - fetchurl = fetchurl; - stdenv = stdenv; - zlib = zlib; + inherit fetchurl stdenv zlib; }; libxslt = (import ../development/libraries/libxslt) { - fetchurl = fetchurl; - stdenv = stdenv; - libxml2 = libxml2; + inherit fetchurl stdenv libxml2; }; gettext = (import ../development/libraries/gettext) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; db4 = (import ../development/libraries/db4) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; openssl = (import ../development/libraries/openssl) { - fetchurl = fetchurl; - stdenv = stdenv; - perl = perl; + inherit fetchurl stdenv perl; }; freetype = (import ../development/libraries/freetype) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; fontconfig = (import ../development/libraries/fontconfig) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv freetype expat ed; x11 = xfree86; - freetype = freetype; - expat = expat; - ed = ed; }; xft = (import ../development/libraries/xft) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; + inherit fetchurl stdenv pkgconfig fontconfig; x11 = xfree86; - fontconfig = fontconfig; }; zlib = (import ../development/libraries/zlib) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; libjpeg = (import ../development/libraries/libjpeg) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; libtiff = (import ../development/libraries/libtiff) { - fetchurl = fetchurl; - stdenv = stdenv; - zlib = zlib; - libjpeg = libjpeg; + inherit fetchurl stdenv zlib libjpeg; }; libpng = (import ../development/libraries/libpng) { - fetchurl = fetchurl; - stdenv = stdenv; - zlib = zlib; + inherit fetchurl stdenv zlib; }; popt = (import ../development/libraries/popt) { - fetchurl = fetchurl; - stdenv = stdenv; - gettext = gettext; + inherit fetchurl stdenv gettext; }; scrollkeeper = (import ../development/libraries/scrollkeeper) { - fetchurl = fetchurl; - stdenv = stdenv; - perl = perl; - libxml2 = libxml2; - libxslt = libxslt; - docbook_xml_dtd = docbook_xml_dtd; - perlXMLParser = perlXMLParser; + inherit fetchurl stdenv perl libxml2 libxslt + docbook_xml_dtd perlXMLParser; }; glib = (import ../development/libraries/gtk+/glib) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - gettext = gettext; - perl = perl; + inherit fetchurl stdenv pkgconfig gettext perl; }; atk = (import ../development/libraries/gtk+/atk) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - glib = glib; - perl = perl; + inherit fetchurl stdenv pkgconfig glib perl; }; pango = (import ../development/libraries/gtk+/pango) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; + inherit fetchurl stdenv pkgconfig glib xft; x11 = xfree86; - glib = glib; - xft = xft; }; gtk = (import ../development/libraries/gtk+/gtk+) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; + inherit fetchurl stdenv pkgconfig glib atk pango perl + libtiff libjpeg libpng; x11 = xfree86; - glib = glib; - atk = atk; - pango = pango; - perl = perl; - libtiff = libtiff; - libjpeg = libjpeg; - libpng = libpng; }; glib1 = (import ../development/libraries/gtk+-1/glib) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; gtk1 = (import ../development/libraries/gtk+-1/gtk+) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; x11 = xfree86; glib = glib1; }; gdkpixbuf = (import ../development/libraries/gtk+-1/gdk-pixbuf) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv libtiff libjpeg libpng; gtk = gtk1; - libtiff = libtiff; - libjpeg = libjpeg; - libpng = libpng; }; audiofile = (import ../development/libraries/audiofile) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; esound = (import ../development/libraries/gnome/esound) { - fetchurl = fetchurl; - stdenv = stdenv; - audiofile = audiofile; + inherit fetchurl stdenv audiofile; }; libIDL = (import ../development/libraries/gnome/libIDL) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - glib = glib; + inherit fetchurl stdenv pkgconfig glib; lex = flex; yacc = bison; }; ORBit2 = (import ../development/libraries/gnome/ORBit2) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - glib = glib; - libIDL = libIDL; - popt = popt; + inherit fetchurl stdenv pkgconfig glib libIDL popt; }; GConf = (import ../development/libraries/gnome/GConf) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; - glib = glib; - gtk = gtk; - libxml2 = libxml2; - ORBit2 = ORBit2; - popt = popt; + inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt; }; libbonobo = (import ../development/libraries/gnome/libbonobo) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; - ORBit2 = ORBit2; - libxml2 = libxml2; - popt = popt; + inherit fetchurl stdenv pkgconfig perl ORBit2 libxml2 popt flex; yacc = bison; - flex = flex; }; gnomemimedata = (import ../development/libraries/gnome/gnome-mime-data) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; + inherit fetchurl stdenv pkgconfig perl; }; gnomevfs = (import ../development/libraries/gnome/gnome-vfs) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; - glib = glib; - libxml2 = libxml2; - GConf = GConf; - libbonobo = libbonobo; - gnomemimedata = gnomemimedata; - popt = popt; - bzip2 = bzip2; # !!! use stdenv.bzip2 + inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf + libbonobo gnomemimedata popt bzip2; + # !!! use stdenv.bzip2 }; libgnome = (import ../development/libraries/gnome/libgnome) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; - glib = glib; - gnomevfs = gnomevfs; - libbonobo = libbonobo; - GConf = GConf; - popt = popt; - zlib = zlib; + inherit fetchurl stdenv pkgconfig perl glib gnomevfs + libbonobo GConf popt zlib; }; libart_lgpl = (import ../development/libraries/gnome/libart_lgpl) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; libglade = (import ../development/libraries/gnome/libglade) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - gtk = gtk; - libxml2 = libxml2; + inherit fetchurl stdenv pkgconfig gtk libxml2; }; libgnomecanvas = (import ../development/libraries/gnome/libgnomecanvas) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - gtk = gtk; + inherit fetchurl stdenv pkgconfig gtk libglade; libart = libart_lgpl; - libglade = libglade; }; libbonoboui = (import ../development/libraries/gnome/libbonoboui) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; - libxml2 = libxml2; - libglade = libglade; - libgnome = libgnome; - libgnomecanvas = libgnomecanvas; + inherit fetchurl stdenv pkgconfig perl libxml2 libglade + libgnome libgnomecanvas; }; libgnomeui = (import ../development/libraries/gnome/libgnomeui) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - libgnome = libgnome; - libgnomecanvas = libgnomecanvas; - libbonoboui = libbonoboui; - libglade = libglade; + inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas + libbonoboui libglade; }; wxGTK = (import ../development/libraries/wxGTK) { + inherit fetchurl stdenv; fetchurl = fetchurl; stdenv = stdenv; pkgconfig = pkgconfig; @@ -673,230 +469,151 @@ }; gnet = (import ../development/libraries/gnet) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - glib = glib; + inherit fetchurl stdenv pkgconfig glib; }; libdvdcss = (import ../development/libraries/libdvdcss) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; libdvdread = (import ../development/libraries/libdvdread) { - fetchurl = fetchurl; - stdenv = stdenv; - libdvdcss = libdvdcss; + inherit fetchurl stdenv libdvdcss; }; libdvdplay = (import ../development/libraries/libdvdplay) { - fetchurl = fetchurl; - stdenv = stdenv; - libdvdread = libdvdread; + inherit fetchurl stdenv libdvdread; }; mpeg2dec = (import ../development/libraries/mpeg2dec) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; a52dec = (import ../development/libraries/a52dec) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; libmad = (import ../development/libraries/libmad) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; zvbi = (import ../development/libraries/zvbi) { - fetchurl = fetchurl; - stdenv = stdenv; - x11 = xfree86; + inherit fetchurl stdenv libpng; pngSupport = true; + x11 = xfree86; libpng = libpng; }; perlBerkeleyDB = (import ../development/perl-modules/BerkeleyDB) { - fetchurl = fetchurl; - stdenv = stdenv; - perl = perl; - db4 = db4; + inherit fetchurl stdenv perl db4; }; perlXMLParser = (import ../development/perl-modules/XML-Parser) { - fetchurl = fetchurl; - stdenv = stdenv; - perl = perl; - expat = expat; + inherit fetchurl stdenv perl expat; }; ### SERVERS apacheHttpd = (import ../servers/http/apache-httpd) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv perl openssl db4 expat; sslSupport = true; db4Support = true; - perl = perl; - openssl = openssl; - db4 = db4; - expat = expat; }; xfree86 = (import ../servers/x11/xfree86) { + inherit fetchurl stdenv flex bison; buildServer = false; buildClientLibs = true; - fetchurl = fetchurl; - stdenv = stdenv; - flex = flex; - bison = bison; }; ### OS-SPECIFIC kernelHeaders = (import ../os-specific/linux/kernel-headers) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; alsaLib = (import ../os-specific/linux/alsa/library) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; ### DATA docbook_xml_dtd = (import ../data/sgml+xml/schemas/xml-dtd/docbook) { - fetchurl = fetchurl; - stdenv = stdenv; - unzip = unzip; + inherit fetchurl stdenv unzip; }; docbook_xml_xslt = (import ../data/sgml+xml/stylesheets/xslt/docbook) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; ### APPLICATIONS subversion = (import ../applications/version-management/subversion) { + inherit fetchurl stdenv openssl db4 expat swig; localServer = true; httpServer = false; sslSupport = true; swigBindings = false; - fetchurl = fetchurl; - stdenv = stdenv; - openssl = openssl; httpd = apacheHttpd; - db4 = db4; - expat = expat; - swig = swig; }; pan = (import ../applications/networking/newsreaders/pan) { + inherit fetchurl stdenv pkgconfig gtk gnet libxml2 perl pcre; spellChecking = false; - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - gtk = gtk; - gnet = gnet; - libxml2 = libxml2; - perl = perl; - pcre = pcre; }; sylpheed = (import ../applications/networking/mailreaders/sylpheed) { + inherit fetchurl stdenv openssl gdkpixbuf; sslSupport = true; imageSupport = true; - fetchurl = fetchurl; - stdenv = stdenv; gtk = gtk1; - openssl = openssl; - gdkpixbuf = gdkpixbuf; }; firebird = (import ../applications/networking/browsers/firebird) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - gtk = gtk; - perl = perl; - zip = zip; - libIDL = libIDL; + inherit fetchurl stdenv pkgconfig gtk perl zip libIDL; }; MPlayer = (import ../applications/video/MPlayer) { + inherit fetchurl stdenv freetype; alsaSupport = true; - fetchurl = fetchurl; - stdenv = stdenv; x11 = xfree86; - freetype = freetype; alsa = alsaLib; }; MPlayerPlugin = (import ../applications/video/mplayerplug-in) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; x11 = xfree86; }; vlc = (import ../applications/video/vlc) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv wxGTK libdvdcss libdvdplay + mpeg2dec a52dec libmad; x11 = xfree86; - wxGTK = wxGTK; - libdvdcss = libdvdcss; - libdvdplay = libdvdplay; - mpeg2dec = mpeg2dec; - a52dec = a52dec; - libmad = libmad; alsa = alsaLib; }; zapping = (import ../applications/video/zapping) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - perl = perl; - python = python; + inherit fetchurl stdenv pkgconfig perl python libgnomeui libglade + scrollkeeper esound gettext zvbi libjpeg libpng; x11 = xfree86; - libgnomeui = libgnomeui; - libglade = libglade; - scrollkeeper = scrollkeeper; - esound = esound; - gettext = gettext; teletextSupport = true; - zvbi = zvbi; jpegSupport = true; - libjpeg = libjpeg; pngSupport = true; - libpng = libpng; }; gqview = (import ../applications/graphics/gqview) { - fetchurl = fetchurl; - stdenv = stdenv; - pkgconfig = pkgconfig; - gtk = gtk; - libpng = libpng; + inherit fetchurl stdenv pkgconfig gtk libpng; }; hello = (import ../applications/misc/hello) { - fetchurl = fetchurl; - stdenv = stdenv; - perl = perl; + inherit fetchurl stdenv perl; }; nxml = (import ../applications/editors/emacs/modes/nxml) { - fetchurl = fetchurl; - stdenv = stdenv; + inherit fetchurl stdenv; }; } |