diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-09-01 17:38:55 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-09-01 17:38:55 +0000 |
| commit | 006c7c854a95db3497b61c3f80ba58ed29ed5d85 (patch) | |
| tree | f5aab7e40fffa29717c69400fab80f969d5b555d /pkgs/development/libraries/libxcrypt | |
| parent | 58fedb26b45afe15a19f620bc6e5cd2b12a6195c (diff) | |
| download | nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.tar nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.tar.gz nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.tar.bz2 nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.tar.lz nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.tar.xz nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.tar.zst nixpkgs-006c7c854a95db3497b61c3f80ba58ed29ed5d85.zip | |
Adding a patch for libxcrypt that could make it build for gcc 4.6. Untested; I
only looked at the hydra log. svn path=/nixpkgs/branches/stdenv-updates/; revision=28961
Diffstat (limited to 'pkgs/development/libraries/libxcrypt')
| -rw-r--r-- | pkgs/development/libraries/libxcrypt/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxcrypt/gcc46.patch | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index aea9e53eef6..b2c9a2c9cf5 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -11,4 +11,7 @@ stdenv.mkDerivation { url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-3.0.2.tar.bz2; sha256 = "15l2xvhi3r3b40x4665c101ikylh5xsbpw03gnszypfjgn1jkcii"; }; + + patches = [ ./gcc46.patch ]; + } diff --git a/pkgs/development/libraries/libxcrypt/gcc46.patch b/pkgs/development/libraries/libxcrypt/gcc46.patch new file mode 100644 index 00000000000..0664f96aa68 --- /dev/null +++ b/pkgs/development/libraries/libxcrypt/gcc46.patch @@ -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++) { |