Author: ludo
Date: Tue Nov  9 09:14:16 2010
New Revision: 24625
URL: https://svn.nixos.org/websvn/nix/?rev=24625&sc=1

Log:
Fix libcanberra.

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix

Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix     Tue Nov 
 9 09:14:12 2010        (r24624)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix     Tue Nov 
 9 09:14:16 2010        (r24625)
@@ -3216,6 +3216,12 @@
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
+    /* Using GNU Make 3.82 leads to this:
+
+         Makefile:939: *** missing separator (did you mean TAB instead of 8 
spaces?).  Stop.
+
+       So use 3.81.  */
+    stdenv = overrideInStdenv stdenv [gnumake381];
     gstreamer = gst_all.gstreamer;
   };
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to