diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2015-10-26 21:08:51 +0900 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-10 09:08:09 +0100 |
| commit | 63385e971250812a232c5853b28cd46d80836a2c (patch) | |
| tree | e96ac4ee4344f9293519e98c2a85763302c29c6c /pkgs/development/libraries/ncurses | |
| parent | 2441e002e26d60e62306ae03a2c0d42fe156f129 (diff) | |
| download | nixlib-63385e971250812a232c5853b28cd46d80836a2c.tar nixlib-63385e971250812a232c5853b28cd46d80836a2c.tar.gz nixlib-63385e971250812a232c5853b28cd46d80836a2c.tar.bz2 nixlib-63385e971250812a232c5853b28cd46d80836a2c.tar.lz nixlib-63385e971250812a232c5853b28cd46d80836a2c.tar.xz nixlib-63385e971250812a232c5853b28cd46d80836a2c.tar.zst nixlib-63385e971250812a232c5853b28cd46d80836a2c.zip | |
ncurses: revived clang patch (close #10622)
Diffstat (limited to 'pkgs/development/libraries/ncurses')
| -rw-r--r-- | pkgs/development/libraries/ncurses/clang.patch | 42 | ||||
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 2 |
2 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ncurses/clang.patch b/pkgs/development/libraries/ncurses/clang.patch new file mode 100644 index 000000000000..ce33049bf405 --- /dev/null +++ b/pkgs/development/libraries/ncurses/clang.patch @@ -0,0 +1,42 @@ +diff -ruNp ncurses-5.8.orig/c++/cursesf.h ncurses-5.8/c++/cursesf.h +--- ncurses-5.8.orig/c++/cursesf.h 2005-08-13 21:08:24.000000000 +0300 ++++ ncurses-5.8/c++/cursesf.h 2011-04-03 18:29:29.000000000 +0300 +@@ -681,7 +681,7 @@ public: + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Fields=FALSE) +- : NCursesForm (Fields, with_frame, autoDelete_Fields) { ++ : NCursesForm (&Fields, with_frame, autoDelete_Fields) { + if (form) + set_user (const_cast<void *>(p_UserData)); + }; +@@ -694,7 +694,7 @@ public: + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Fields=FALSE) +- : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, ++ : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x, + with_frame, autoDelete_Fields) { + if (form) + set_user (const_cast<void *>(p_UserData)); +diff -ruNp ncurses-5.8.orig/c++/cursesm.h ncurses-5.8/c++/cursesm.h +--- ncurses-5.8.orig/c++/cursesm.h 2005-08-13 21:10:36.000000000 +0300 ++++ ncurses-5.8/c++/cursesm.h 2011-04-03 18:31:42.000000000 +0300 +@@ -639,7 +639,7 @@ public: + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Items=FALSE) +- : NCursesMenu (Items, with_frame, autoDelete_Items) { ++ : NCursesMenu (&Items, with_frame, autoDelete_Items) { + if (menu) + set_user (const_cast<void *>(p_UserData)); + }; +@@ -651,7 +651,7 @@ public: + int begin_x = 0, + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE) +- : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { ++ : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) { + if (menu) + set_user (const_cast<void *>(p_UserData)); + }; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 517410051581..c505d89a6d8f 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; # gcc-5.patch should be removed after 5.9 - patches = [ ./gcc-5.patch ]; + patches = [ ./clang.patch ./gcc-5.patch ]; configureFlags = [ "--with-shared" |