summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-03-24 21:54:13 -0500
committerWill Dietz <w@wdtz.org>2019-03-24 21:54:13 -0500
commit34845f2f67154fdee639a28f6e0d34e9538eb9a8 (patch)
treefaa787ba75bcb96e34cb78ea887aaa46804029ad
parent575df3a129dc880ea94a85d44c67ec49568927df (diff)
downloadnixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.tar
nixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.tar.gz
nixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.tar.bz2
nixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.tar.lz
nixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.tar.xz
nixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.tar.zst
nixpkgs-34845f2f67154fdee639a28f6e0d34e9538eb9a8.zip
bleachbit: use format="other", simplify.
Patch by @worldbypeace, during PR review.  Thanks!
-rw-r--r--pkgs/applications/misc/bleachbit/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 42bdb078a3d..c79a98ef716 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 ];