diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22 17:28:51 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22 17:28:51 +0100 |
commit | d12c9911dfcb336243c9d13b8bc7042be3f3d4b2 (patch) | |
tree | b689c775feef38ad8c315999e0a761dfa694eb1e /pkgs/applications/search/catfish/default.nix | |
parent | fab12188b855d9ac1f64f486ee38f1cf7d53c8f4 (diff) | |
parent | 186c76539855a8d1a3e76af0ff95b5de50aa48f8 (diff) | |
download | nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.gz nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.bz2 nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.lz nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.xz nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.tar.zst nixlib-d12c9911dfcb336243c9d13b8bc7042be3f3d4b2.zip |
Merge remote-tracking branch 'origin/master' into nix-2.0
Diffstat (limited to 'pkgs/applications/search/catfish/default.nix')
-rw-r--r-- | pkgs/applications/search/catfish/default.nix | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index f6df5fc496d7..c355b193dfd1 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,15 +1,17 @@ -{ 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 = [ @@ -17,6 +19,7 @@ pythonPackages.buildPythonApplication rec { file which intltool + gobjectIntrospection wrapGAppsHook ]; @@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.pyxdg pythonPackages.ptyprocess pythonPackages.pycairo + hicolor_icon_theme ]; propagatedBuildInputs = [ @@ -35,17 +39,20 @@ 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 @@ -53,7 +60,6 @@ pythonPackages.buildPythonApplication rec { 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 ]; |