diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-10-26 13:53:51 +0100 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-10-26 15:39:26 +0100 |
| commit | b2dc7cb8f91d904e4d9530de84c3a846e5262e80 (patch) | |
| tree | 4d0e9fbdd358f02a5266a274b92b058ab0a0c8a1 | |
| parent | 061ffcf2ad98f82816e1bde568d0bcd4fb73eae0 (diff) | |
| download | guix-b2dc7cb8f91d904e4d9530de84c3a846e5262e80.tar guix-b2dc7cb8f91d904e4d9530de84c3a846e5262e80.tar.gz | |
gnu: sqlite: Move Hurd-specific patch into source.
* gnu/packages/sqlite.scm (sqlite)[native-inputs]: Move conditional
"sqlite-hurd.patch" to...
[source]: ...here.
[arguments]: Remove "patch-sqlite/hurd" stage.
| -rw-r--r-- | gnu/packages/sqlite.scm | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index eeb77749d8..03794f6311 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -62,16 +62,12 @@ 6 #\0)))))) (string-append "https://sqlite.org/2020/sqlite-autoconf-" numeric-version ".tar.gz"))) + (patches (search-patches "sqlite-hurd.patch")) (sha256 (base32 "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) - (native-inputs (if (hurd-target?) - ;; TODO move into origin on the next rebuild cycle. - `(("hurd-locking-mode.patch" - ,@(search-patches "sqlite-hurd.patch"))) - '())) (outputs '("out" "static")) (arguments `(#:configure-flags @@ -86,18 +82,6 @@ ;; Column metadata is required by GNU Jami and Qt, et.al. "-DSQLITE_ENABLE_COLUMN_METADATA")) #:phases (modify-phases %standard-phases - ;; TODO: remove in the next rebuild cycle - ,@(if (hurd-target?) - `((add-after 'unpack 'patch-sqlite/hurd - (lambda* (#:key inputs native-inputs - #:allow-other-keys) - (let ((patch (assoc-ref - (if ,(%current-target-system) - native-inputs - inputs) - "hurd-locking-mode.patch"))) - (invoke "patch" "-p1" "--force" "-i" patch))))) - '()) (add-after 'install 'move-static-library (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |