From c6eaf088a96772b7b7dbd19630eefccf16d822a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 21 Jul 2018 10:00:37 +0200
Subject: python.pkgs.av: move expression

---
 pkgs/development/python-modules/av/default.nix | 32 ++++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 23 ++----------------
 2 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/av/default.nix

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
new file mode 100644
index 000000000000..2b9e298a222d
--- /dev/null
+++ b/pkgs/development/python-modules/av/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pillow
+, numpy
+, ffmpeg_2
+, git
+, libav
+, pkgconfig
+}:
+
+buildPythonPackage rec {
+  pname = "av";
+  version = "0.2.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0";
+  };
+
+  buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ];
+
+  # Because of https://github.com/mikeboers/PyAV/issues/152
+  doCheck = false;
+
+  meta = {
+    description = "Pythonic bindings for FFmpeg/Libav";
+    homepage = https://github.com/mikeboers/PyAV/;
+    license = lib.licenses.bsd2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd92733bdfaf..17dee795b5a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -638,27 +638,8 @@ in {
 
   autopep8 = callPackage ../development/python-modules/autopep8 { };
 
-  av = buildPythonPackage rec {
-    name = "av-${version}";
-    version = "0.2.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/av/${name}.tar.gz";
-      sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0";
-    };
-
-    buildInputs
-      =  (with self; [ nose pillow numpy ])
-      ++ (with pkgs; [ ffmpeg_2 git libav pkgconfig ]);
-
-    # Because of https://github.com/mikeboers/PyAV/issues/152
-    doCheck = false;
-
-    meta = {
-      description = "Pythonic bindings for FFmpeg/Libav";
-      homepage = https://github.com/mikeboers/PyAV/;
-      license = licenses.bsd2;
-    };
+  av = callPackage ../development/python-modules/av {
+    inherit (pkgs) ffmpeg_2 git libav pkgconfig;
   };
 
   avro = callPackage ../development/python-modules/avro {};
-- 
cgit 1.4.1