diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2020-05-12 02:21:52 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2020-05-12 02:21:52 +0300 |
| commit | d79dbaf18475c98cd7304c32c844b4117e29d793 (patch) | |
| tree | 8a3a6b4342ad06c6d0fb3834fd424614632ca33b | |
| parent | gnu: Add sysdig. (diff) | |
| download | guix-wigust-d79dbaf18475c98cd7304c32c844b4117e29d793.tar.gz | |
w
| -rw-r--r-- | guix/wigust/packages/sysdig.scm | 54 |
1 files changed, 5 insertions, 49 deletions
diff --git a/guix/wigust/packages/sysdig.scm b/guix/wigust/packages/sysdig.scm index d443ee6..d621715 100644 --- a/guix/wigust/packages/sysdig.scm +++ b/guix/wigust/packages/sysdig.scm @@ -97,28 +97,17 @@ (base32 "153g9dmgcnzx12kn6wg30g25bxsqzsvr5xyg1l5180i37n16fi3r")) (patches - (append #;'() (search-patches "sysdig-docker-fix.patch") + (append (search-patches "sysdig-docker-fix.patch") (list (origin (method url-fetch) (uri "https://git.archlinux.org/svntogit/community.git/plain/trunk/glibc.patch?h=packages/sysdig") (file-name "sysdig-fix-scap_fds.patch") (sha256 (base32 - "0fbrcg4pq56ji9y1rfsxy7jsmnhy8aapx9znkiqc7d8ca0ayg7lx"))))))) - #;(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/draios/sysdig.git") - (commit ""))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "253g9dmgcnzx12kn6wg30g25bxsqzsvr5xyg1l5180i37n16fi3r")))) + "0fbrcg4pq56ji9y1rfsxy7jsmnhy8aapx9znkiqc7d8ca0ayg7lx")))))))) (build-system cmake-build-system) (inputs - `(;; ("pkg-config" ,pkg-config) - ;; TODO: ("googletest" ,googletest) - ("zlib" ,zlib) + `(("zlib" ,zlib) ("luajit" ,lua-5.1) ("ncurses" ,ncurses) ("jsoncpp" ,jsoncpp) @@ -131,10 +120,7 @@ ("tbb" ,tbb) ("c-ares" ,c-ares) ("protobuf" ,protobuf) - ("grpc" ,grpc) - )) - ;; (native-inputs - ;; `(("gcc" ,gcc-10))) + ("grpc" ,grpc))) (arguments `(#:parallel-build? #f #:tests? #f @@ -145,37 +131,7 @@ "-DBUILD_LIBSCAP_EXAMPLES=OFF" ;libscap examples are not installed "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" "-DCMAKE_C_FLAGS=-Wno-deprecated-declarations" - "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations" - ;; "-DUSE_BUNDLED_JSONCPP=OFF" - ;; "-DCMAKE_EXE_LINKER_FLAGS=\"-ltbb -lcurl\"" - ;; "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))" - ) - ;; #:modules ((guix build cmake-build-system) - ;; (guix build utils) - ;; (ice-9 match)) - #;#:phases - #;(modify-phases %standard-phases - (add-after 'set-paths 'hide-default-gcc - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent - ;; conflicts with the GCC 5 input. - (for-each (match-lambda ((env path) - (let ((path (string-append gcc path))) - (format #t "Delete ~s from ~a environment variable.~%" path env) - (setenv env - (string-join (delete path - (string-split (getenv env) - #\:)) - ":"))))) - '(("CMAKE_PREFIX_PATH" "/include/c++") - ("CMAKE_PREFIX_PATH" "/include") - ("CPLUS_INCLUDE_PATH" "/include/c++") - ("CPLUS_INCLUDE_PATH" "/include") - ("C_INCLUDE_PATH" "/include"))) - (pk (environ)) - #t))))) - ) + "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations"))) (home-page "https://sysdig.com/opensource/") (synopsis "Tracepoint-based system tracing tool for Linux") (description "") |