From 8a39e4a553ba1fff6673e73ff84d2c12d874d026 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 17 Aug 2017 17:56:40 +0200 Subject: [PATCH] gnu: sassc: Update to 3.4.5. * gnu/packages/web.scm (sassc): Update to 3.4.5. [arguments]: Add PREFIX to make-flags, disable tests, remove custom install phase. --- gnu/packages/web.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2649d68a21..6eb9833f21 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -933,7 +933,7 @@ minimum to provide high performance operation.") (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.2.5") + (let* ((version "3.4.5") (libsass (origin (method url-fetch) @@ -943,7 +943,7 @@ minimum to provide high performance operation.") (file-name (string-append "libsass-" version ".tar.gz")) (sha256 (base32 - "1x25k6p1s1yzsdpzb7bzh8japilmi1mk3z96q66pycbinj9z9is4"))))) + "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"))))) (package (name "sassc") (version version) @@ -954,11 +954,16 @@ minimum to provide high performance operation.") (file-name (string-append "sassc-" version ".tar.gz")) (sha256 (base32 - "1xf3w75w840rj0nx375rxi7mcv1ngqqq8p3zrzjlyx8jfpnldmv5")))) + "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") + `(#: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 'configure) @@ -968,13 +973,7 @@ minimum to provide high performance operation.") (begin (setenv "SASS_LIBSASS_PATH" (string-append (getcwd) "/libsass-" ,version)) - #t)))) - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (mkdir-p bin) - (copy-file "bin/sassc" (string-append bin "/sassc")) - #t)))))) + #t))))))) (inputs `(("libsass" ,libsass))) (synopsis "CSS pre-processor")