Merge pull request #7748 from codyopel/libsass

libsass: 3.1.0 -> 3.2.2 & sassc: 3.1.0 -> 3.2.1

2 files changed, 22 insertions, 30 deletions

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index dbfa1656a1a6..69bae8abfeba 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.1.0";
+  version = "3.2.2";
 
-  src = fetchFromGitHub {
-    owner = "sass";
-    repo = "libsass";
-    rev = version;
-    sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
+  src = fetchurl {
+    url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
+    sha256 = "022rvsnqslds1ss6ls1x1w93mrhq7nigd00wjlnd07qhfqpbnwax";
   };
 
-  preConfigure = ''
-    autoreconf --force --install
+  patchPhase = ''
+    export LIBSASS_VERSION=${version}
   '';
 
-  buildInputs = [ autoconf automake libtool ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A C/C++ implementation of a Sass compiler";
-    license = licenses.mit;
     homepage = https://github.com/sass/libsass;
+    license = licenses.mit;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
index b9b897421658..451ee3a719cf 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/pkgs/development/tools/sassc/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libsass }:
+{ stdenv, fetchurl, autoreconfHook, libsass }:
 
 stdenv.mkDerivation rec {
-  name = "sassc";
-  version = "3.1.0";
+  name = "sassc-${version}";
+  version = "3.2.1";
 
-  src = fetchFromGitHub {
-    owner = "sass";
-    repo = "sassc";
-    rev = version;
-    sha256 = "0lpilmsir9b9292a4b8kq3zzg5cfh031p0krgam5rmsn39i6ivs4";
+  src = fetchurl {
+    url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
+    sha256 = "18pp7ylcwfvfagvnpw660cdvv7cjl7pl9v8x7xr05fp2l6133rxw";
   };
 
-  preConfigure = ''
-    export SASSC_VERSION="3.1.0"
-    autoreconf --force --install
+  patchPhase = ''
+    export SASSC_VERSION=${version}
   '';
 
-  buildInputs = [ autoconf automake libtool libsass ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp sassc $out/bin/
-  '';
+  buildInputs = [ libsass ];
 
   meta = with stdenv.lib; {
     description = "A front-end for libsass";
-    license = licenses.mit;
     homepage = https://github.com/sass/sassc/;
+    license = licenses.mit;
     maintainers = with maintainers; [ pjones ];
     platforms = platforms.unix;
   };