Author: raskin
Date: Tue Aug 28 09:27:29 2012
New Revision: 34613
URL: https://nixos.org/websvn/nix/?rev=34613&sc=1
Log:
Reimplement nixCustom functionality with overrides
Modified:
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Tue Aug 28
09:26:25 2012 (r34612)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Tue Aug 28
09:27:29 2012 (r34613)
@@ -155,12 +155,32 @@
]
));
- nix = pkgs.nixCustomFun ("" + /home/repos/nix + "/")
- ""
- ["nix-reduce-build" "nix-http-export.cgi"]
- ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"
- "--with-docbook-rng=${pkgs.docbook5}/xml/rng/docbook"
- ];
+ nix = pkgs.lib.overrideDerivation pkgs.nixUnstable (x: rec {
+ src = "/home/repos/nix/";
+ revisionStamp = (builtins.readFile (src + "/.git/refs/heads/master"));
+ preConfigure = ''
+ sed -e '/bin_SCRIPTS = /anix-reduce-build \\' -i scripts/Makefile.am
+ sed -e '/bin_SCRIPTS = /anix-http-export.cgi \\' -i scripts/Makefile.am
+ export
AC_LOCAL_PATH="$AC_LOCAL_PATH:${pkgs.autoconf}/share/aclocal:${pkgs.libtool}/share/aclocal:${pkgs.automake}/share/aclocal"
+ set
+ export
+ ./bootstrap.sh
+ '' + (if x ? preConfigure then x.preConfigure else "");
+ buildNativeInputs = (with pkgs; [
+ autoconf automake libtool bison flex gettext
+ perlPackages.WWWCurl perlPackages.DBDSQLite perlPackages.DBI
+ libxml2 libxslt w3m
+ docbook5 docbook5_xsl docbook_xml_dtd_45
+ ]) ++ x.buildNativeInputs;
+ buildInputs = (with pkgs; [
+ perlPackages.WWWCurl perlPackages.DBDSQLite perlPackages.DBI
+ ]) ++ x.buildInputs;
+ configureFlags = x.configureFlags + ''
+ --with-docbook-rng=${pkgs.docbook5}/xml/rng/docbook
+ --with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook
+ --with-xml-flags=--nonet
+ '';
+ });
pathsToLink = ["/"];
shellInit = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
