From 1bbc6fe55a2832fc1c67bb65baf365858c85f954 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 1 Dec 2007 16:20:23 +0000 Subject: Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes. svn path=/nixpkgs/trunk/; revision=9812 --- .../window-managers/compiz-fusion/bcop/0.6.0.nix | 1 + .../compiz-fusion/general-dependencies.nix | 2 +- pkgs/applications/window-managers/compiz/0.6.2.nix | 9 ++- .../libraries/libdbi-drivers/0.8.2-1.nix | 39 +++++++++++++ pkgs/development/libraries/libdbi/0.8.2.nix | 21 +++++++ pkgs/development/libraries/libextractor/0.5.18.nix | 21 +++++++ pkgs/development/tools/misc/intltool/0.36.2.nix | 5 +- pkgs/lib/default.nix | 8 +++ pkgs/tools/system/gdmap/0.7.5.nix | 21 +++++++ pkgs/top-level/all-packages.nix | 66 +++++++++++++++++++++- pkgs/top-level/builder-defs.nix | 18 +++--- 11 files changed, 192 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix create mode 100644 pkgs/development/libraries/libdbi/0.8.2.nix create mode 100644 pkgs/development/libraries/libextractor/0.5.18.nix create mode 100644 pkgs/tools/system/gdmap/0.7.5.nix (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix index ee6fd586dfe..1072e9b363c 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare doPropagate]); + inherit propagatedBuildInputs; meta = { description = " Compiz BCOP. diff --git a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix index 1a041eaf2d6..717d66e2c29 100644 --- a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix +++ b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix @@ -3,7 +3,7 @@ build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamag */ args: with args; [ - libXcomposite libpng libSM libXrandr libXdamage libXinerama startupnotification + libpng GConf mesa metacity librsvg dbus dbus_glib gnomedesktop git autoconf automake libtool libxslt libwnck intltool perl perlXMLParser compiz ] diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix index 92f67ba6877..6eef24beb99 100644 --- a/pkgs/applications/window-managers/compiz/0.6.2.nix +++ b/pkgs/applications/window-managers/compiz/0.6.2.nix @@ -6,7 +6,7 @@ args : with args; sha256 = "0k58bkbyqx94ch7scvn3d26296ai9nddfb6lg8v3bhbi2zj4i2n5"; }; buildInputs = [ - pkgconfig libXrender xextproto gtk libwnck GConf libgnome + pkgconfig gtk libwnck GConf libgnome libgnomeui metacity gnomegtk glib pango libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel librsvg fuse @@ -14,7 +14,8 @@ args : with args; propagatedBuildInputs = [ libpng libXcomposite libXfixes libXdamage libXrandr libXinerama libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt - dbus dbus_glib + dbus dbus_glib compositeproto fixesproto damageproto randrproto + xineramaproto renderproto kbproto xextproto libXrender ]; configureFlags = ["--enable-gtk" "--enable-fuse" "--enable-annotate" "--enable-librsvg"] ++ @@ -35,7 +36,9 @@ stdenv.mkDerivation rec { name = "compiz-0.6.2"; builder = writeScript (name + "-builder") - (textClosure [doPatch doConfigure doMakeInstall doForceShare postAll]); + (textClosure [doPatch doConfigure doMakeInstall doPropagate + doForceShare postAll]); + inherit propagatedBuildInputs; meta = { description = " Compiz window manager diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix new file mode 100644 index 00000000000..be0db328ef9 --- /dev/null +++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix @@ -0,0 +1,39 @@ +args : with args; + with builderDefs { + src = /* put a fetchurl here */ + fetchurl { + url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz; + sha256 = "1bflwl1k3rf1h8clx3zv5pxnm5hbhq6izikv0phkss3qxkjm61ap"; + }; + + buildInputs = [libdbi] + ++(if args ? mysql then [args.mysql] else []) + ++(if args ? sqlite then [args.sqlite] else []) + ; + configureFlags = [ + " --enable-libdbi " + " --with-dbi-incdir=${libdbi}/include " + " --with-dbi-libdir=${libdbi}/lib " + ] + ++ (if args ? mysql then [ + " --with-mysql " + " --with-mysql-incdir=${mysql}/include/mysql " + " --with-mysql-libdir=${mysql}/lib/mysql " + ] else []) + ++ (if args ? sqlite then [ + " --with-sqlite " + " --with-sqlite-incdir=${sqlite}/include/sqlite " + " --with-sqlite-libdir=${sqlite}/lib/sqlite " + ] else []) + ; + } null; /* null is a terminator for sumArgs */ +stdenv.mkDerivation rec { + name = "libdbi"+version; + builder = writeScript (name + "-builder") + (textClosure [doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + DB independent interface to DB; DB drivers (mysql only for now). +"; + }; +} diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix new file mode 100644 index 00000000000..e7dc24417f2 --- /dev/null +++ b/pkgs/development/libraries/libdbi/0.8.2.nix @@ -0,0 +1,21 @@ +args : with args; + with builderDefs { + src = /* put a fetchurl here */ + fetchurl { + url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz; + sha256 = "01zlfv9hd4iv9v1xlh64ajdgx95jb0sjpazavapqc0zwiagwcg4d"; + }; + + buildInputs = []; + configureFlags = []; + } null; /* null is a terminator for sumArgs */ +stdenv.mkDerivation rec { + name = "libdbi"+version; + builder = writeScript (name + "-builder") + (textClosure [doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + DB independent interface to DB. +"; + }; +} diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix new file mode 100644 index 00000000000..3f8304d7304 --- /dev/null +++ b/pkgs/development/libraries/libextractor/0.5.18.nix @@ -0,0 +1,21 @@ +args : with args; + with builderDefs { + src = /* put a fetchurl here */ + fetchurl { + url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz; + sha256 = "09y869zmnr6n2953ra4y7z9m9nj23prlqa4nr4rwcb50dzdmil1k"; + }; + + buildInputs = [ zlib]; + configureFlags = []; + } null; /* null is a terminator for sumArgs */ +stdenv.mkDerivation rec { + name = "libextractor"+version; + builder = writeScript (name + "-builder") + (textClosure [doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + Libextractor - extracts metadata from files. +"; + }; +} diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix index f42a6901dfa..d8315a9ba62 100644 --- a/pkgs/development/tools/misc/intltool/0.36.2.nix +++ b/pkgs/development/tools/misc/intltool/0.36.2.nix @@ -6,13 +6,14 @@ args : with args; sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj"; }; - buildInputs = [perl perlXMLParser]; + propagatedBuildInputs = [perl perlXMLParser]; configureFlags = []; } null; /* null is a terminator for sumArgs */ stdenv.mkDerivation rec { name = "intltool-0.36.2"; builder = writeScript (name + "-builder") - (textClosure [doConfigure doMakeInstall doForceShare]); + (textClosure [doConfigure doMakeInstall doPropagate doForceShare]); + inherit propagatedBuildInputs; meta = { description = " Internalization tool for XML. diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index e86ff3ef01f..4d58270db23 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -251,4 +251,12 @@ rec { debugVal = if builtins ? trace then x: (builtins.trace x x) else x: x; debugXMLVal = if builtins ? trace then x: (builtins.trace (builtins.toXML x) x) else x: x; + innerClosePropagation = ready: list: if list == [] then ready else + if (head list) ? propagatedBuildInputs then + innerClosePropagation (ready ++ [(head list)]) + ((head list).propagatedBuildInputs ++ (tail list)) else + innerClosePropagation (ready ++ [(head list)]) (tail list); + + closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); + } diff --git a/pkgs/tools/system/gdmap/0.7.5.nix b/pkgs/tools/system/gdmap/0.7.5.nix new file mode 100644 index 00000000000..354ebb966a1 --- /dev/null +++ b/pkgs/tools/system/gdmap/0.7.5.nix @@ -0,0 +1,21 @@ +args : with args; + with builderDefs { + src = /* put a fetchurl here */ + fetchurl { + url = http://dfn.dl.sourceforge.net/sourceforge/gdmap/gdmap-0.7.5.tar.gz; + sha256 = "0vxfgz1bq0jvny6dy7dkzg2kl56plrxby6c4y5d6bv4bq2xd6v26"; + }; + + buildInputs = [gtk pkgconfig libxml2 intltool]; + configureFlags = []; + } null; /* null is a terminator for sumArgs */ +stdenv.mkDerivation rec { + name = "gdmap"+version; + builder = writeScript (name + "-builder") + (textClosure [doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + Recursive rectangle map of disk usage. +"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7a8717679c..fcdda93b873 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -455,6 +455,16 @@ rec { inherit fetchurl stdenv; }); + gdmapFun = lib.sumArgs (selectVersion ../tools/system/gdmap) { + inherit stdenv fetchurl builderDefs pkgconfig libxml2 + intltool; + inherit (gtkLibs) gtk; + }; + + gdmap = gdmapFun { + version = "0.7.5"; + } null; + getopt = import ../tools/misc/getopt { inherit fetchurl stdenv; }; @@ -537,6 +547,18 @@ rec { inherit fetchurl stdenv ocaml; }; + /*hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus ) { + inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse + pkgconfig perl gettext dbus dbus_glib pcre libscd; + inherit (gtkLibs) glib; + bison = bison23; + flex = flex2533; + }; + + hyppocampus = hyppocampusFun { + version = "0.3rc1"; + } null;*/ + jdiskreport = import ../tools/misc/jdiskreport { inherit fetchurl stdenv unzip jdk; }; @@ -1946,6 +1968,25 @@ rec { inherit fetchurl stdenv; }; + libdbiFun = lib.sumArgs (selectVersion ../development/libraries/libdbi) { + inherit stdenv fetchurl builderDefs; + }; + + libdbi = libdbiFun { + version = "0.8.2"; + } null; + + libdbiDriversFun = lib.sumArgs (selectVersion ../development/libraries/libdbi-drivers) { + inherit stdenv fetchurl builderDefs libdbi; + }; + + libdbiDrivers = libdbiDriversFun { + version = "0.8.2-1"; + mysql = mysql5; + inherit sqlite; + } null; + + libdrm = import ../development/libraries/libdrm { inherit fetchurl stdenv; }; @@ -1970,6 +2011,15 @@ rec { inherit fetchurl stdenv gettext; }; + libextractorFun = lib.sumArgs (selectVersion ../development/libraries/libextractor) + { + inherit fetchurl stdenv builderDefs zlib; + }; + + libextractor = libextractorFun { + version = "0.5.18"; + } null; + libgcrypt = import ../development/libraries/libgcrypt { inherit fetchurl stdenv libgpgerror; }; @@ -2034,6 +2084,14 @@ rec { inherit fetchurl stdenv zlib; }; + /*libscdFun = lib.sumArgs (selectVersion ../development/libraries/libscd) { + inherit stdenv fetchurl builderDefs libextractor perl pkgconfig; + }; + + libscd = libscdFun { + version = "0.4.2"; + } null;*/ + libsigcxx = import ../development/libraries/libsigcxx { inherit fetchurl stdenv pkgconfig; }; @@ -3572,7 +3630,7 @@ rec { libjpeg libpng zlib /* smpeg sdl */; inherit (xlibs) inputproto libXi; lib = lib_unstable; - python = python25; + python = python_alts.v_2_5; freealut = freealut_soft; openal = openalSoft; stdenv = stdenvUsingSetupNew2; @@ -3634,7 +3692,8 @@ rec { inherit lib builderDefs stringsWithDeps; inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt; inherit (xorg) libXcomposite libXfixes libXdamage libXrandr - libXinerama libICE libSM libXrender xextproto; + libXinerama libICE libSM libXrender xextproto compositeproto fixesproto + damageproto randrproto xineramaproto renderproto kbproto; inherit (gnome) startupnotification libwnck GConf; inherit (gtkLibs) gtk; inherit (gnome) libgnome libgnomeui metacity @@ -4505,7 +4564,7 @@ rec { inherit fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg - cppunit cyrus_sasl openldap enchant openexr exiv2 samba nss log4cxx aspell + cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline saneBackends chmlib python libzip gmp sqlite libidn runCommand lib @@ -4522,6 +4581,7 @@ rec { qt = qt4; dbus = dbus_alts.withX11; bison = bison23; + openexr = openexr_1_6_1 ; }); kdebase = import ../desktops/kde/kdebase { diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index 01940499d61..94f83b9c06f 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -3,6 +3,8 @@ args: with args; with stringsWithDeps; with lib; { inherit writeScript; + + forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"]; archiveType = s: @@ -107,18 +109,10 @@ args: with args; with stringsWithDeps; with lib; if test -f \$pkg/nix-support/setup-hook; then source \$pkg/nix-support/setup-hook fi - - if test -f \$pkg/nix-support/propagated-build-inputs; then - for i in \$(cat \$pkg/nix-support/propagated-build-inputs); do - findInputs \$i - done - fi } pkgs=\"\" - for i in \$NIX_GCC ${toString buildInputs} ${toString - (if (args ? propagatedBuildInputs) then - args.propagatedBuildInputs else "")}; do + for i in \$NIX_GCC ${toString buildInputs}; do findInputs \$i done @@ -287,7 +281,11 @@ args: with args; with stringsWithDeps; with lib; autoConfigureFlags = condConcat "" configFlags check; autoMakeFlags = condConcat "" buildFlags check; useConfig = getAttr ["useConfig"] false args; - buildInputs = if useConfig then autoBuildInputs else getAttr ["buildInputs"] [] args; + buildInputs = + lib.closePropagation ((if useConfig then + autoBuildInputs else + getAttr ["buildInputs"] [] args)++ + (getAttr ["propagatedBuildInputs"] [] args)); configureFlags = if useConfig then autoConfigureFlags else getAttr ["configureFlags"] "" args; makeFlags = if useConfig then autoMakeFlags else getAttr ["makeFlags"] "" args; -- cgit 1.4.1