Merge pull request #34899 from romildo/upd.catfish

catfish: 1.4.2 -> 1.4.4

pkgs/applications/search/catfish/default.nix

@@ -1,22 +1,25 @@
-{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils,
-  gnome3, pythonPackages, wrapGAppsHook }:
+{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection,
+  findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme,
+  wrapGAppsHook
+}:
 
 pythonPackages.buildPythonApplication rec {
   majorver = "1.4";
-  minorver = "2";
+  minorver = "4";
   version = "${majorver}.${minorver}";
-  name = "catfish-${version}";
+  pname = "catfish";
 
   src = fetchurl {
-    url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2";
-    sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3";
+    url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${pname}-${version}.tar.gz";
+    sha256 = "1mw7py6si6y88jblmzm04hf049bpww7h87k2wypq07zm1dw55m52";
   };
 
   nativeBuildInputs = [
     pythonPackages.distutils_extra
     file
     which
     intltool
+    gobjectIntrospection
     wrapGAppsHook
   ];
 
@@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec {
     pythonPackages.pyxdg
     pythonPackages.ptyprocess
     pythonPackages.pycairo
+    hicolor_icon_theme
   ];
 
   propagatedBuildInputs = [
@@ -35,25 +39,27 @@ pythonPackages.buildPythonApplication rec {
     findutils
   ];
 
-  preFixup = ''
-    rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc"
-    for f in \
-      "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
-      "$out/share/applications/catfish.desktop"
-    do
-      substituteInPlace $f --replace "${pythonPackages.python}" "$out"
-    done
+  # Explicitly set the prefix dir in "setup.py" because setuptools is
+  # not using "$out" as the prefix when installing catfish data. In
+  # particular the variable "__catfish_data_directory__" in
+  # "catfishconfig.py" is being set to a subdirectory in the python
+  # path in the store.
+  postPatch = ''
+    sed -i "/^        if self.root/i\\        self.prefix = \"$out\"" setup.py
   '';
 
+  # Disable check because there is no test in the source distribution
+  doCheck = false;
+
   meta = with stdenv.lib; {
+    homepage = https://launchpad.net/catfish-search;
     description = "A handy file search tool";
     longDescription = ''
       Catfish is a handy file searching tool. The interface is
       intentionally lightweight and simple, using only GTK+3.
       You can configure it to your needs by using several command line
       options.
     '';
-    homepage = https://launchpad.net/catfish-search;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

pkgs/top-level/all-packages.nix

@@ -14549,9 +14549,7 @@ with pkgs;
 
   carddav-util = callPackage ../tools/networking/carddav-util { };
 
-  catfish = callPackage ../applications/search/catfish {
-    pythonPackages = python2Packages;
-  };
+  catfish = callPackage ../applications/search/catfish { };
 
   cava = callPackage ../applications/audio/cava { };