Merge branch 'nixpkgs-update' into master

1 files changed, 10 insertions, 9 deletions

diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 7aa7cf3d452..8750bdf2ac6 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,12 +1,13 @@
-# alsaLib vorbis-tools python can be made optional
+# alsa-lib vorbis-tools python can be made optional
 
-{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }:
+{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
 
-stdenv.mkDerivation {
-  name = "snack-2.2.10";
+stdenv.mkDerivation rec {
+  pname = "snack";
+  version = "2.2.10";
 
   src = fetchurl {
-    url = "https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz";
+    url = "https://www.speech.kth.se/snack/dist/${pname}${version}.tar.gz";
     sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
   };
 
@@ -14,7 +15,7 @@ stdenv.mkDerivation {
 
   postUnpack = ''sourceRoot="$sourceRoot/unix"'';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ];
 
   hardeningDisable = [ "format" ];
@@ -23,13 +24,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out
-    make install DESTDIR="$out" 
+    make install DESTDIR="$out"
   '';
 
-  meta = { 
+  meta = {
     description = "The Snack Sound Toolkit (Tcl)";
     homepage = "http://www.speech.kth.se/snack/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     broken = true;
   };
 }