summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/search
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-10-03 01:47:08 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-10-03 01:47:08 +0200
commitb3fcd9375d89060979ce67d13c6714ebc3e1c002 (patch)
treee5120c8684e77b7b579c5fd348915cecdca66c57 /pkgs/applications/search
parent3a4658ea04d66e849aa29c1f747ab8becc14949c (diff)
parent3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff)
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/search')
-rw-r--r--pkgs/applications/search/catfish/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index 11674f1951a5..bce5795a9c7e 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -5,13 +5,13 @@
pythonPackages.buildPythonApplication rec {
majorver = "1.4";
- minorver = "7";
+ minorver = "10";
version = "${majorver}.${minorver}";
pname = "catfish";
src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
- sha256 = "1s97jb1r07ff40jnz8zianpn1f0c67hssn8ywdi2g7njfb4amjj8";
+ sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
file
which
intltool
- gobject-introspection
+ gobject-introspection # for setup hook populating GI_TYPELIB_PATH
wrapGAppsHook
];
@@ -29,9 +29,11 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.pyxdg
pythonPackages.ptyprocess
pythonPackages.pycairo
+ gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
];
propagatedBuildInputs = [
+ pythonPackages.dbus-python
pythonPackages.pygobject3
pythonPackages.pexpect
xdg_utils
@@ -52,7 +54,7 @@ pythonPackages.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://docs.xfce.org/apps/catfish/start;
- description = "A handy file search tool";
+ description = "Handy file search tool";
longDescription = ''
Catfish is a handy file searching tool. The interface is
intentionally lightweight and simple, using only GTK 3.