Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master

1 files changed, 10 insertions, 10 deletions

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 65482e8e9c6..028bf5cac33 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,23 +1,23 @@
 { lib, stdenv, fetchurl, static ? false }:
 
-with lib;
-
-stdenv.mkDerivation {
-  name = "libjpeg-9d";
+stdenv.mkDerivation rec {
+  pname = "libjpeg";
+  version = "9d";
 
   src = fetchurl {
-    url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz";
+    url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz";
     sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc";
   };
 
-  configureFlags = optional static "--enable-static --disable-shared";
+  configureFlags = lib.optional static "--enable-static --disable-shared";
 
   outputs = [ "bin" "dev" "out" "man" ];
 
-  meta = {
-    homepage = "http://www.ijg.org/";
+  meta = with lib; {
+    homepage = "https://www.ijg.org/";
     description = "A library that implements the JPEG image file format";
-    license = lib.licenses.free;
-    platforms = lib.platforms.unix;
+    maintainers = with maintainers; [ ];
+    license = licenses.free;
+    platforms = platforms.unix;
   };
 }