From 05a94cd62287a6122d3cf96c35ae9ded6c53ada4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:35:04 +0100
Subject: [PATCH] python: libarchive-c: 2.7 -> 2.8

---
 .../python-modules/libarchive-c/default.nix          | 12 +++++++-----
 pkgs/top-level/python-packages.nix                   |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix
index e1beafaf10a1..52cca5d36fb6 100644
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/pkgs/development/python-modules/libarchive-c/default.nix
@@ -2,25 +2,27 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
-, pkgs
+, glibcLocales
+, libarchive
+, mock
 }:
 
 buildPythonPackage rec {
   pname = "libarchive-c";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "011bfsmqpcwd6920kckllh7zhw2y4rrasgmddb7wjzn2hg1xpsjn";
+    sha256 = "06d44d5b9520bdac93048c72b7ed66d11a6626da16d2086f9aad079674d8e061";
   };
 
-  buildInputs = [ pytest pkgs.glibcLocales ];
+  checkInputs = [ mock pytest glibcLocales ];
 
   LC_ALL="en_US.UTF-8";
 
   postPatch = ''
     substituteInPlace libarchive/ffi.py --replace \
-      "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'"
+      "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'"
   '';
 
   checkPhase = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef1d1d40ad6d..1f5323baa30f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4446,7 +4446,9 @@ in {
 
   python-libarchive = callPackage ../development/python-modules/python-libarchive { };
 
-  libarchive-c = callPackage ../development/python-modules/libarchive-c { };
+  libarchive-c = callPackage ../development/python-modules/libarchive-c {
+    inherit (pkgs) libarchive;
+  };
 
   libasyncns = callPackage ../development/python-modules/libasyncns {
     inherit (pkgs) libasyncns pkgconfig;