Author: viric Date: Thu Sep 1 17:38:55 2011 New Revision: 28961 URL: https://svn.nixos.org/websvn/nix/?rev=28961&sc=1
Log: Adding a patch for libxcrypt that could make it build for gcc 4.6. Untested; I only looked at the hydra log. Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/gcc46.patch Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix Thu Sep 1 17:38:05 2011 (r28960) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix Thu Sep 1 17:38:55 2011 (r28961) @@ -11,4 +11,7 @@ url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-3.0.2.tar.bz2; sha256 = "15l2xvhi3r3b40x4665c101ikylh5xsbpw03gnszypfjgn1jkcii"; }; + + patches = [ ./gcc46.patch ]; + } Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/gcc46.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/gcc46.patch Thu Sep 1 17:38:55 2011 (r28961) @@ -0,0 +1,18 @@ +For gcc 4.6 to build this. Otherwise it says 's unused variable', and it's built +with -Werror. + +diff --git a/src/cert.c b/src/cert.c +index 28c7b11..34570a4 100644 +--- a/src/cert.c ++++ b/src/cert.c +@@ -87,9 +87,7 @@ char *cp; + int i,j,t; + + for(i=0;i<8;i++){ +- int s; +- +- s = scanf("%2x",&t); ++ scanf("%2x",&t); + if(feof(stdin)) + good_bye(); + for(j=0; j<8 ; j++) { _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits