Author: simons
Date: Mon Nov 15 17:47:36 2010
New Revision: 24692
URL: https://svn.nixos.org/websvn/nix/?rev=24692&sc=1

Log:
Enable building of static libraries so that urweb can build statically
linked binaries.

Modified:
   nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix
   nixpkgs/trunk/pkgs/development/libraries/libmhash/default.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix  Mon Nov 15 
12:39:50 2010        (r24691)
+++ nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix  Mon Nov 15 
17:47:36 2010        (r24692)
@@ -24,6 +24,8 @@
       export GCCARGS="-I${mysql}/include/mysql -I${postgresql}/include 
-I${sqlite}/include -L${libmhash}/lib -L${mysql}/lib/mysql -L${postgresql}/lib 
-L${sqlite}/lib"
     '';
 
+  dontDisableStatic = true;
+
   meta = {
     description = "Ur/Web supports construction of dynamic web applications 
backed by SQL databases.";
     longDescription = ''

Modified: nixpkgs/trunk/pkgs/development/libraries/libmhash/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libmhash/default.nix       Mon Nov 
15 12:39:50 2010        (r24691)
+++ nixpkgs/trunk/pkgs/development/libraries/libmhash/default.nix       Mon Nov 
15 17:47:36 2010        (r24692)
@@ -17,6 +17,8 @@
   version = "0.9.9.9";
   name = "${pname}-${version}";
 
+  dontDisableStatic = true;
+
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
     sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to