diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-05 08:46:49 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-05 08:46:56 -0700 |
| commit | 0a32eab91e7a547325958da2581933a98095d50c (patch) | |
| tree | 9ac78b2de9a984bd96b4240ddd1269a56720d6eb /pkgs/development/libraries/ncurses | |
| parent | 4e8da0747c88375c221bf1b0f060183a863c6851 (diff) | |
| download | nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.gz nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.bz2 nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.lz nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.xz nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.zst nixlib-0a32eab91e7a547325958da2581933a98095d50c.zip | |
fix LLVM packages to work in darwin stdenv
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, 0 insertions, 44 deletions
diff --git a/pkgs/development/libraries/ncurses/clang.patch b/pkgs/development/libraries/ncurses/clang.patch deleted file mode 100644 index ce33049bf405..000000000000 --- a/pkgs/development/libraries/ncurses/clang.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 046c7347f863..a76bba24c62f 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"; }; - patches = [ ./clang.patch ]; - configureFlags = [ "--with-shared" "--with-cxx-shared" |