1 files changed, 11 insertions, 55 deletions

diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index e09fff8..3244680 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gn packages arrayfire)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix licenses))
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
@@ -38,7 +38,11 @@
   #:use-module (gnu packages pkg-config)
   ;;#:use-module (gnu packages mesa)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages databases)
+  ;;#:use-module (gnu packages lapack)
   #:use-module (gnu packages ldc)
+  ;;#:use-module (gnu packages gfortran)
+  #:use-module (gnu packages python)  
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
@@ -56,64 +60,32 @@
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
-        ("doxygen" ,doxygen)
         ("gawk" ,gawk)
-        ("gettext" ,gnu-gettext)
-        ("icedtea7" ,icedtea7) 
         ("libtool" ,libtool)
-        ("pkg-config" ,pkg-config)
-        ("swig" ,swig)
-        ("which" ,which)
-        ("yasm" ,yasm)))
+        ("pkg-config" ,pkg-config)))
     (inputs `(("boost" ,boost)
-       ("bzip2" ,bzip2)
        ("glfw" ,glfw)
        ("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
        ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
-       ("fribidi" ,fribidi)
        ("glew" ,glew)
-       ("gnutls" ,gnutls)
-       ("gperf" ,gperf)
        ("libcap" ,libcap)
-       ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
-       ("libssh" ,libssh)
        ("libtiff" ,libtiff)
-       ("libxml2" ,libxml2)
-       ("libxmu" ,libxmu)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
        ("libyajl" ,libyajl)
-       ("lzo" ,lzo)
        ("mesa-utils" ,mesa-utils)
        ("mysql" ,mysql)
        ("openssl" ,openssl)
-       ("pcre" ,pcre)
        ("python" ,python-2)
-       ("tinyxml" ,tinyxml)
-       ("unzip" ,unzip)
-       ("zip" ,zip)
        ("freeimage" ,freeimage)
        ("fftw" ,fftw)
        ("fftwf" ,fftwf)
        ("fftw-openmpi" ,fftw-openmpi)
-       ("atlas" ,atlas)
-       ("gfortran", gfortran)
        ("glew" ,glew)
        ("glu" ,glu)
-       ("libx11" ,libx11)
-       ("libxi" ,libxi)
-       ("libxrandr" ,libxrandr)
-       ("libxxf86vm" ,libxxf86vm)
-       ("inputproto" ,inputproto)
-       ("glproto" ,glproto)
        ("cmake" ,cmake)
        ("zlib" ,zlib)))
     (build-system cmake-build-system)
@@ -122,7 +94,7 @@
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
-    (license gpl2+)))
+    (license gpl3+)))
 
 (define-public glfw
   (package
@@ -136,46 +108,30 @@
              (sha256
               (base32
                "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
+    (build-system cmake-build-system)
     (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
         ("libtool" ,libtool)
         ("pkg-config" ,pkg-config)))
-    (inputs `(("bzip2" ,bzip2)
-       ("curl" ,curl)
+    (inputs `(("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
-       ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
-       ("fribidi" ,fribidi)
+       ("eudev" ,eudev)
        ("glew" ,glew)
-       ("gnutls" ,gnutls)
-       ("gperf" ,gperf)
        ("libcap" ,libcap)
-       ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
-       ("libssh" ,libssh)
        ("libtiff" ,libtiff)
-       ("libxml2" ,libxml2)
-       ("libxmu" ,libxmu)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
-       ("lzo" ,lzo)
        ("mesa-utils" ,mesa-utils)
        ("mysql" ,mysql)
        ("openssl" ,openssl)
        ("python" ,python-2)
-       ("tinyxml" ,tinyxml)
-       ("unzip" ,unzip)
-       ("zip" ,zip)
        ("zlib" ,zlib)))       
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-    (license gpl2)))
+    (license gpl3+)))