From 34845f2f67154fdee639a28f6e0d34e9538eb9a8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 21:54:13 -0500 Subject: [PATCH] bleachbit: use format="other", simplify. Patch by @worldbypeace, during PR review. Thanks! --- pkgs/applications/misc/bleachbit/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 42bdb078a3d8..c79a98ef7168 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -3,6 +3,8 @@ pythonPackages.buildPythonApplication rec { pname = "bleachbit"; version = "2.2"; + format = "other"; + src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1yj9bc3k6s1aib7znb79h5rybfv691zz4szxkwf9fm9nr0dws603"; @@ -16,11 +18,13 @@ pythonPackages.buildPythonApplication rec { find -type f -exec sed -i -e 's@/usr/bin@${placeholder "out"}/bin@g' {} \; ''; - doCheck = false; + dontBuild = true; - postInstall = '' - make install SHELL=${stdenv.shell} prefix=${placeholder "out"} - ''; + installFlags = [ "prefix=${placeholder "out"}" ]; + + doCheck = true; + + checkTarget = "tests"; propagatedBuildInputs = with pythonPackages; [ pygtk ];