all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 34514@debbugs.gnu.org
Subject: [bug#34514] [PATCH 17/34] gnu: sassc: Update and improve the package.
Date: Sun, 17 Feb 2019 19:22:57 +0000	[thread overview]
Message-ID: <20190217192314.5666-17-mail@cbaines.net> (raw)
In-Reply-To: <20190217192314.5666-1-mail@cbaines.net>

Now that libsass is packaged, change the sassc package to build a dynamically
linked binary. Also update the version, and change the source to the Git
repository, rather than the archives from GitHub.

* gnu/packages/web.scm (sassc): Update to 3.5.0.
[source]: Change to the Git repository.
[arguments]: Tweak to link against libsass.
---
 gnu/packages/web.scm | 95 +++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 49 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ed2a7df2e1..49fbfd1f8d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1284,56 +1284,53 @@ stylesheets, you'll need to use another program that uses this library,
     (license l:expat)))
 
 (define-public sassc
-  ;; libsass must be statically linked and it isn't included in the sassc
-  ;; release tarballs, hence this odd package recipe.
-  (let* ((version "3.4.5")
-         (libsass
-          (origin
-            (method url-fetch)
-            (uri (string-append
-                  "https://github.com/sass/libsass/archive/"
-                  version ".tar.gz"))
-            (file-name (string-append "libsass-" version ".tar.gz"))
-            (sha256
-             (base32
-              "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x")))))
-    (package
-      (name "sassc")
-      (version version)
-      (source (origin
-                (method url-fetch)
-                (uri (string-append "https://github.com/sass/sassc/archive/"
-                                    version ".tar.gz"))
-                (file-name (string-append "sassc-" version ".tar.gz"))
-                (sha256
-                 (base32
-                  "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9"))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:make-flags
-         (list "CC=gcc"
-               (string-append "PREFIX=" (assoc-ref %outputs "out")))
-         #:test-target "test"
-         ;; FIXME: "make test" rebuilds the application and gets lost in a
-         ;; non-existing directory.
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'bootstrap)
-           (delete 'configure)
-           (add-after 'unpack 'unpack-libsass-and-set-path
-             (lambda* (#:key inputs #:allow-other-keys)
-               (invoke "tar" "xvf" (assoc-ref inputs "libsass"))
-               (setenv "SASS_LIBSASS_PATH"
-                       (string-append (getcwd) "/libsass-" ,version))
-               #t)))))
-      (inputs
-       `(("libsass" ,libsass)))
-      (synopsis "CSS pre-processor")
-      (description "SassC is a compiler written in C for the CSS pre-processor
+  (package
+    (name "sassc")
+    (version "3.5.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/sass/sassc.git")
+                    (commit  version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0jsfz1zg4gwk0dq8i92ll12axs3s70wsdsmdyi71zx8zmvib5nl6"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       ;; I don't believe sassc contains any tests
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-Makefile
+           (lambda _
+             (substitute* "Makefile"
+               (("build-shared: \\$\\(RESOURCES\\) \\$\\(OBJECTS\\) \\$\\(LIB_SHARED\\)")
+                "build-shared: $(RESOURCES) $(OBJECTS)")
+               (("\\$\\(SASSC_EXE\\): libsass build")
+                "$(SASSC_EXE): build")
+               (("install: libsass-install-\\$\\(BUILD\\) \\\\")
+                "install: \\"))
+             #t))
+         ;; This phase fails for some reason
+         (delete 'bootstrap)
+         ;; There is no configure script
+         (delete 'configure)
+         (add-before 'build 'setup-environment
+           (lambda _
+             (setenv "BUILD" "shared")
+             (setenv "SASSC_VERSION" ,version)
+             #t)))))
+    (inputs
+     `(("libsass" ,libsass)))
+    (synopsis "CSS pre-processor")
+    (description "SassC is a compiler written in C for the CSS pre-processor
 language known as SASS.")
-      (home-page "http://sass-lang.com/libsass")
-      (license l:expat))))
+    (home-page "http://sass-lang.com/libsass")
+    (license l:expat)))
 
 \f
 (define-public perl-apache-logformat-compiler
-- 
2.20.1

  parent reply	other threads:[~2019-02-17 19:24 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-17 19:13 [bug#34514] [PATCH 00/34] Add more Ruby gems, some Rails related Christopher Baines
2019-02-17 19:22 ` [bug#34514] [PATCH 01/34] gnu: Add ruby-hamster Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 02/34] gnu: Add ruby-lino Christopher Baines
2019-02-18 22:42     ` Ricardo Wurmus
2019-02-17 19:22   ` [bug#34514] [PATCH 03/34] gnu: Add ruby-terraform Christopher Baines
2019-02-18 22:43     ` Ricardo Wurmus
2019-02-19 22:43       ` Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 04/34] gnu: Add ruby-que Christopher Baines
2019-02-18 22:45     ` Ricardo Wurmus
2019-02-17 19:22   ` [bug#34514] [PATCH 05/34] gnu: Add ruby-rbnacl Christopher Baines
2019-02-18 22:47     ` Ricardo Wurmus
2019-02-19 22:20       ` Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 06/34] gnu: Add ruby-jwt Christopher Baines
2019-02-20 11:54     ` Ricardo Wurmus
2019-03-02 12:34       ` Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 07/34] gnu: Add ruby-multi-xml Christopher Baines
2019-02-20 17:04     ` Ricardo Wurmus
2019-03-02 12:36       ` Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 08/34] gnu: Add ruby-oauth2 Christopher Baines
2019-02-20 17:08     ` Ricardo Wurmus
2019-02-17 19:22   ` [bug#34514] [PATCH 09/34] gnu: Add ruby-omniauth Christopher Baines
2019-02-20 20:34     ` Ricardo Wurmus
2019-02-17 19:22   ` [bug#34514] [PATCH 10/34] gnu: Add ruby-warden Christopher Baines
2019-02-20 20:35     ` Ricardo Wurmus
2019-03-02 12:38       ` Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 11/34] gnu: Add ruby-warden-oauth2 Christopher Baines
2019-02-20 20:36     ` Ricardo Wurmus
2019-02-17 19:22   ` [bug#34514] [PATCH 12/34] gnu: Add ruby-with-advisory-lock Christopher Baines
2019-02-20 22:11     ` Ricardo Wurmus
2019-03-02 12:40       ` Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 13/34] gnu: Add ruby-omniauth-oauth2 Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 14/34] gnu: Add ruby-test-construct Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 15/34] gnu: Add ruby-minitest-around Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 16/34] gnu: Add libsass Christopher Baines
2019-02-17 19:22   ` Christopher Baines [this message]
2019-02-17 19:22   ` [bug#34514] [PATCH 18/34] gnu: Add ruby-sassc Christopher Baines
2019-02-17 19:22   ` [bug#34514] [PATCH 19/34] gnu: Add ruby-markaby Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 20/34] gnu: Add ruby-temple Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 21/34] gnu: Add ruby-haml Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 22/34] gnu: Add ruby-tilt Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 23/34] gnu: Add ruby-sass-rails Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 24/34] gnu: Add ruby-dep Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 25/34] gnu: ruby-jekyll-watch: Update to 2.1.2 Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 26/34] gnu: Remove ruby-listen-3.0 Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 27/34] gnu: ruby-listen: Enable running the tests Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 28/34] gnu: Add ruby-bindex Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 29/34] gnu: Add ruby-web-console Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 30/34] gnu: Add ruby-execjs Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 31/34] gnu: ruby: Update some RSpec packages Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 32/34] gnu: Add ruby-rspec-rails Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 33/34] gnu: Add ruby-autoprefixer-rails Christopher Baines
2019-02-17 19:23   ` [bug#34514] [PATCH 34/34] gnu: Add ruby-rerun Christopher Baines
2019-02-18 22:40   ` [bug#34514] [PATCH 01/34] gnu: Add ruby-hamster Ricardo Wurmus
2019-02-19 22:55     ` Christopher Baines
2019-02-20  7:48       ` Ricardo Wurmus
2019-03-05  7:51 ` [bug#34514] [PATCH 00/34] Add more Ruby gems, some Rails related Christopher Baines
2019-03-05  7:54 ` [bug#34514] [PATCH v2 01/12] gnu: Add ruby-sass-rails Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 02/12] gnu: Add ruby-dep Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 03/12] gnu: ruby-jekyll-watch: Update to 2.1.2 Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 04/12] gnu: Remove ruby-listen-3.0 Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 05/12] gnu: ruby-listen: Enable running the tests Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 06/12] gnu: Add ruby-bindex Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 07/12] gnu: Add ruby-web-console Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 08/12] gnu: Add ruby-execjs Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 09/12] gnu: ruby: Update some RSpec packages Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 10/12] gnu: Add ruby-rspec-rails Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 11/12] gnu: Add ruby-autoprefixer-rails Christopher Baines
2019-03-05  7:54   ` [bug#34514] [PATCH v2 12/12] gnu: Add ruby-rerun Christopher Baines
2019-03-24  9:43 ` bug#34514: [PATCH 00/34] Add more Ruby gems, some Rails related Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190217192314.5666-17-mail@cbaines.net \
    --to=mail@cbaines.net \
    --cc=34514@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.