Merge branch 'nixpkgs-update' into master

1 files changed, 31 insertions, 19 deletions

diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index bed92477a3f..cd007c5fe57 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -1,37 +1,49 @@
-{ stdenv, fetchurl
-, pkgconfig, autoreconfHook
-, readline, texinfo
-, gdbm, gmp, libffi }:
-
-with stdenv.lib;
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, gdbm
+, gmp
+, libffi
+, pkg-config
+, readline
+, texinfo
+}:
 
 stdenv.mkDerivation rec {
   pname = "librep";
   version = "0.92.7";
-  sourceName = "librep_${version}";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz";
+    url = "https://download.tuxfamily.org/${pname}/${pname}_${version}.tar.xz";
     sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ readline texinfo ];
-  propagatedBuildInputs = [ gdbm gmp libffi ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    texinfo
+  ];
+  buildInputs = [
+    gdbm
+    gmp
+    libffi
+    readline
+  ];
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with lib;{
+    homepage = "http://sawfish.tuxfamily.org/";
     description = "Fast, lightweight, and versatile Lisp environment";
     longDescription = ''
-      librep is a Lisp system for UNIX, comprising an
-      interpreter, a byte-code compiler, and a virtual
-      machine. It can serve as an application extension language
-      but is also suitable for standalone scripts.
-     '';
-    homepage = "http://sawfish.wikia.com";
-    license = licenses.gpl2;
+      librep is a Lisp system for UNIX, comprising an interpreter, a byte-code
+      compiler, and a virtual machine. It can serve as an application extension
+      language but is also suitable for standalone scripts.
+    '';
+    license = licenses.gpl2Plus;
     maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.unix;
   };
 }
 # TODO: investigate fetchFromGithub