all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Help with copy-build-system
@ 2021-03-10 11:23 Raghav Gururajan
  2021-03-26  9:20 ` Pierre Neidhardt
  0 siblings, 1 reply; 11+ messages in thread
From: Raghav Gururajan @ 2021-03-10 11:23 UTC (permalink / raw)
  To: help-guix


[-- Attachment #1.1.1: Type: text/plain, Size: 260 bytes --]

Hello Guix!

With the attached patch (top be applied on top-off current master), how 
to make copy-build-system to install files as `/bin/foofile` instead of 
`/bin/foodir/foofile`? (The foofiles are selected via #:include)

Thank you!

Regards,
RG.

[-- Attachment #1.1.2: qtsol.diff --]
[-- Type: text/x-patch, Size: 5149 bytes --]

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d921aa87fe..8409fc1803 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2497,18 +2497,18 @@ securely.  It will not store any data unencrypted unless explicitly requested.")
              (with-directory-excursion "qtsingleapplication/src"
                (for-each delete-file
                          (find-files "." "qtlockedfile.*\\.(h|cpp)"))
-                 (substitute* "qtsingleapplication.pri"
-                   ;; Add include path of LockedFile.
-                   (("INCLUDEPATH \\+=")
-                    "INCLUDEPATH += ../../qtlockedfile/src")
-                   ;; Link library of LockedFile.
-                   (("LIBS \\+=")
-                    "LIBS += -lQtSolutions_LockedFile"))
-                 (substitute* '("qtlocalpeer.h" "qtlocalpeer.cpp")
-                   (("#include \"qtlockedfile.*\\.cpp\"") "")
-                   ;; Unwrap namespace added in the vendoring process.
-                   (("QtLP_Private::QtLockedFile")
-                    "QtLockedFile")))
+               (substitute* "qtsingleapplication.pri"
+                 ;; Add include path of LockedFile.
+                 (("INCLUDEPATH \\+=")
+                  "INCLUDEPATH += ../../qtlockedfile/src")
+                 ;; Link library of LockedFile.
+                 (("LIBS \\+=")
+                  "LIBS += -lQtSolutions_LockedFile"))
+               (substitute* '("qtlocalpeer.h" "qtlocalpeer.cpp")
+                 (("#include \"qtlockedfile.*\\.cpp\"") "")
+                 ;; Unwrap namespace added in the vendoring process.
+                 (("QtLP_Private::QtLockedFile")
+                  "QtLockedFile")))
              #t))))
       (build-system gnu-build-system)
       (arguments
@@ -2524,16 +2524,32 @@ securely.  It will not store any data unencrypted unless explicitly requested.")
          (modify-phases %standard-phases
            (add-after 'unpack 'patch-source
              (lambda* (#:key outputs #:allow-other-keys)
+               ;; Rename example to examples, in qtlockedfile,
+               ;; so that it gets picked up during install phase.
+               (with-directory-excursion "qtlockedfile"
+                 (rename-file "example" "examples")
+                 (rename-file "examples/example.pro" "examples/examples.pro")
+                 (substitute* "qtlockedfile.pro"
+                   (("SUBDIRS\\+=example") "SUBDIRS+=examples")))
                (substitute* (find-files "." "common.pri")
+                 ;; Patch run-path for binaries.
+                 (("QMAKE_RPATHDIR \\+= \\$\\$?.*_LIBDIR")
+                  (string-append "QMAKE_RPATHDIR += "
+                                 (assoc-ref outputs "out") "/lib"))
                  ;; Remove unnecessary prefixes/suffixes in library names.
                  (("qt5") "qt")
                  (("-head") ""))
-               ;; Disable building of examples.
-               (substitute* (find-files "." "\\.pro$")
+               ;; Disable building of examples for QtSingleApplication.
+               (substitute* "qtsingleapplication/qtsingleapplication.pro"
                  (("SUBDIRS\\+=examples") ""))
-               ;; Fix deprecated functions.
-               (substitute* "qtsoap/src/qtsoap.cpp"
-                 (("toAscii") "toUtf8"))
+               (with-directory-excursion "qtsoap/src"
+                 ;; Patch Qt imports for QtSoap.
+                 (substitute* "qtsoap.pri"
+                   (("QT \\+= xml network")
+                    "QT += core gui widgets xml network"))
+                 ;; Fix deprecated functions.
+                 (substitute* "qtsoap.cpp"
+                   (("toAscii") "toUtf8")))
                #t))
            (replace 'configure
              (lambda _
@@ -2560,7 +2576,17 @@ securely.  It will not store any data unencrypted unless explicitly requested.")
                               (assoc-ref copy:%standard-phases 'install)
                               #:install-plan
                               '(("src" "include" #:include-regexp ("\\.h$"))
-                                ("lib" "lib"))
+                                ("lib" "lib")
+                                ("examples" "bin"
+                                 #:include ("examples" "canvas_typed"
+                                            "canvas_variant" "decoration"
+                                            "demo" "extension"
+                                            "object_controller" "simple"
+                                            "controller" "interactive"
+                                            "httpservice" "console"
+                                            "loader" "trivial"
+                                            "easter" "google"
+                                            "population")))
                               args)))
                          '("qtlockedfile" "qtpropertybrowser" "qtservice"
                            "qtsingleapplication" "qtsoap")))))))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* Help with copy-build-system
@ 2020-12-24  2:30 Cameron
  0 siblings, 0 replies; 11+ messages in thread
From: Cameron @ 2020-12-24  2:30 UTC (permalink / raw)
  To: help-guix

Hello,

I am new to Guix but it seems to be the perfect tools for running a small cluster of servers that I need to administer. The one thing that so far is holding me back from doing so is the absence of a package for Caddy (https://caddyserver.com) which this cluster relies on heavily. I hope in the future to package it properly, but it has a number of golang dependencies that are not themselves even packaged, and I am far from an expert on building Go software -- it seems doable but it would be a relatively big undertaking.

Instead, I thought I could create a private package with copy-build-system and simply install the pre-built binaries that the Caddy project provides. This is the caddy-package.scm that I have come up with:
> 
> (use-modules (guix)
>              (guix build-system copy)
>      (guix build utils)
>              (guix licenses))
> 
> 
> (package
> (name "caddy")
> 
> (version "2.2.1")
> 
> (source
>   (origin
>    (method url-fetch)
>    (uri (string-append "https://github.com/caddyserver/caddy/releases/download/" version "/caddy_" version "_linux_amd64.tar.gz"))
>    (sha256
>     (base32
>      "1va2h8hpxcby9rny7px1y2xks79rxb4svnf9mrdrlc5xn0s04dsx"))))
> 
> (build-system copy-build-system)
> 
> (arguments
>   '(#:install-plan '(("caddy" "bin/caddy"))))
> 
> (synopsis "This is a *BAD* Caddy package. It just pulls the already-built binary from Github, rather than building from source.")
> (description "See https://caddyserver.com/")
> (home-page "https://caddyserver.com/")
> (license asl2.0))

When I build this file with `guix build -f caddy-package.scm -K', it fails with this rather mysterious (to me) error during the unpack phase:

> starting phase `unpack'
> LICENSE
> README.md
> caddy
> Backtrace:
>            8 (primitive-load "/gnu/store/fa16h805lxm1fmyhdmnwd09cpd7…")
> In ice-9/eval.scm:
>    191:35  7 (_ #f)
> In guix/build/gnu-build-system.scm:
>     838:2  6 (gnu-build #:source _ #:outputs _ #:inputs _ #:phases . #)
> In ice-9/boot-9.scm:
>   1736:10  5 (with-exception-handler _ _ #:unwind? _ # _)
> In srfi/srfi-1.scm:
>    857:16  4 (every1 #<procedure 7ffff634c0a0 at guix/build/gnu-bui…> …)
> In guix/build/gnu-build-system.scm:
>    847:30  3 (_ _)
>    164:15  2 (unpack #:source _)
>      65:2  1 (first-subdirectory _)
> In ice-9/boot-9.scm:
>   1669:16  0 (raise-exception _ #:continuable? _)
> 
> ice-9/boot-9.scm:1669:16: In procedure raise-exception:
> Throw to key `match-error' with args `("match" "no matching pattern" ())'.
> note: keeping build directory `/tmp/guix-build-caddy-2.2.1.drv-20'
> builder for `/gnu/store/p65q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv' failed with exit code 1
> build of /gnu/store/p65q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv failed
> View build log at '/var/log/guix/drvs/p6/5q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv.bz2'.
> guix build: error: build of `/gnu/store/p65q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv' failed

Would anyone be able to give me any advice here? This seems to comport with the Reference Manual blurb (https://guix.gnu.org/manual/en/guix.html#index-copy_002dbuild_002dsystem) about copy-build-system and also appears similar to several official packages using copy-build-system (e.g. gcide, vim-neocomplete, neverball) that I looked to as examples. Clearly though, there is some nuance that I am missing.

Thanks in advance for any help you can provide.

-Cam Tindall

^ permalink raw reply	[flat|nested] 11+ messages in thread
* help with copy-build-system
@ 2020-12-23 23:23 Cameron
  2020-12-24 12:07 ` Julien Lepiller
  0 siblings, 1 reply; 11+ messages in thread
From: Cameron @ 2020-12-23 23:23 UTC (permalink / raw)
  To: help-guix

Hello,

I am new to Guix but it seems to be the perfect tools for running a small cluster of servers that I need to administer. The one thing that so far is holding me back from doing so is the absence of a package for Caddy (https://caddyserver.com) which this cluster relies on heavily. I hope in the future to package it properly, but it has a number of golang dependencies that are not themselves even packaged, and I am far from an expert on building Go software -- it seems doable but it would be a relatively big undertaking.

Instead, I thought I could create a private package with copy-build-system and simply install the pre-built binaries that the Caddy project provides. This is the caddy-package.scm that I have come up with:
> 
> (use-modules (guix)
>              (guix build-system copy)
>      (guix build utils)
>              (guix licenses))
> 
> 
> (package
> (name "caddy")
> 
> (version "2.2.1")
> 
> (source
>   (origin
>    (method url-fetch)
>    (uri (string-append "https://github.com/caddyserver/caddy/releases/download/" version "/caddy_" version "_linux_amd64.tar.gz"))
>    (sha256
>     (base32
>      "1va2h8hpxcby9rny7px1y2xks79rxb4svnf9mrdrlc5xn0s04dsx"))))
> 
> (build-system copy-build-system)
> 
> (arguments
>   '(#:install-plan '(("caddy" "bin/caddy"))))
> 
> (synopsis "This is a *BAD* Caddy package. It just pulls the already-built binary from Github, rather than building from source.")
> (description "See https://caddyserver.com/")
> (home-page "https://caddyserver.com/")
> (license asl2.0))

When I build this file with `guix build -f caddy-package.scm -K', it fails with this rather mysterious (to me) error during the unpack phase:

> starting phase `unpack'
> LICENSE
> README.md
> caddy
> Backtrace:
>            8 (primitive-load "/gnu/store/fa16h805lxm1fmyhdmnwd09cpd7…")
> In ice-9/eval.scm:
>    191:35  7 (_ #f)
> In guix/build/gnu-build-system.scm:
>     838:2  6 (gnu-build #:source _ #:outputs _ #:inputs _ #:phases . #)
> In ice-9/boot-9.scm:
>   1736:10  5 (with-exception-handler _ _ #:unwind? _ # _)
> In srfi/srfi-1.scm:
>    857:16  4 (every1 #<procedure 7ffff634c0a0 at guix/build/gnu-bui…> …)
> In guix/build/gnu-build-system.scm:
>    847:30  3 (_ _)
>    164:15  2 (unpack #:source _)
>      65:2  1 (first-subdirectory _)
> In ice-9/boot-9.scm:
>   1669:16  0 (raise-exception _ #:continuable? _)
> 
> ice-9/boot-9.scm:1669:16: In procedure raise-exception:
> Throw to key `match-error' with args `("match" "no matching pattern" ())'.
> note: keeping build directory `/tmp/guix-build-caddy-2.2.1.drv-20'
> builder for `/gnu/store/p65q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv' failed with exit code 1
> build of /gnu/store/p65q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv failed
> View build log at '/var/log/guix/drvs/p6/5q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv.bz2'.
> guix build: error: build of `/gnu/store/p65q2ndw8hcpiq2x62jb9mxv6xa88kkn-caddy-2.2.1.drv' failed

Would anyone be able to give me any advice here? This seems to comport with the Reference Manual blurb (https://guix.gnu.org/manual/en/guix.html#index-copy_002dbuild_002dsystem) about copy-build-system and also appears similar to several official packages using copy-build-system (e.g. gcide, vim-neocomplete, neverball) that I looked to as examples. Clearly though, there is some nuance that I am missing.

Thanks in advance for any help you can provide.

-Cam Tindall

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-03-26 12:29 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-10 11:23 Help with copy-build-system Raghav Gururajan
2021-03-26  9:20 ` Pierre Neidhardt
2021-03-26  9:55   ` Raghav Gururajan
2021-03-26 11:11     ` Pierre Neidhardt
2021-03-26 11:53       ` Raghav Gururajan
2021-03-26 12:12         ` Pierre Neidhardt
2021-03-26 12:28           ` Raghav Gururajan
  -- strict thread matches above, loose matches on Subject: below --
2020-12-24  2:30 Cameron
2020-12-23 23:23 help " Cameron
2020-12-24 12:07 ` Julien Lepiller
2020-12-24 18:00   ` Cameron

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.