diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-26 15:56:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-26 15:56:06 +0100 |
| commit | 28d992bf6de10f8680d478d72daa41629c54b677 (patch) | |
| tree | 126a724f4a75a539ad1c276a350fff8bba0b6d29 /pkgs/tools/package-management | |
| parent | db9d204d331e6a3942d71c6c1e24f0e0113822ba (diff) | |
| download | nixlib-28d992bf6de10f8680d478d72daa41629c54b677.tar nixlib-28d992bf6de10f8680d478d72daa41629c54b677.tar.gz nixlib-28d992bf6de10f8680d478d72daa41629c54b677.tar.bz2 nixlib-28d992bf6de10f8680d478d72daa41629c54b677.tar.lz nixlib-28d992bf6de10f8680d478d72daa41629c54b677.tar.xz nixlib-28d992bf6de10f8680d478d72daa41629c54b677.tar.zst nixlib-28d992bf6de10f8680d478d72daa41629c54b677.zip | |
checkinstall: fix build with glibc-2.19
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/checkinstall/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/package-management/checkinstall/readlink-types.patch | 19 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 2fbf5282ee12..1320720ed170 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + + # Fix a `conflicting types for 'readlink'' error since Glibc 2.19 + ./readlink-types.patch ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/pkgs/tools/package-management/checkinstall/readlink-types.patch new file mode 100644 index 000000000000..a860607fcf66 --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/readlink-types.patch @@ -0,0 +1,19 @@ +Extracted from Arch's patch +https://projects.archlinux.org/svntogit/community.git/tree/trunk/build-fix.patch?h=packages/checkinstall +diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c +--- checkinstall-1.6.2/installwatch/installwatch.c 2008-11-16 19:20:53.000000000 +0300 ++++ checkinstall-1.6.2.my/installwatch/installwatch.c 2010-01-15 18:55:50.112716628 +0300 +@@ -2938,13 +2938,8 @@ + return result; + } + +-#if (GLIBC_MINOR <= 4) +-int readlink(const char *path,char *buf,size_t bufsiz) { +- int result; +-#else + ssize_t readlink(const char *path,char *buf,size_t bufsiz) { + ssize_t result; +-#endif + instw_t instw; + int status; + |