diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-07 17:15:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-07 17:15:16 -0400 |
commit | 48b6f0eabb5479abc3a69c1395c2353eb73ed57d (patch) | |
tree | 26fccf5704bce3ec46ca189f01d3970cd61eab57 /pkgs | |
parent | fb7193221ec3c03de68123efc600ed7b3685833e (diff) | |
parent | 856c42b87eb4dfa9fbbd2e1e687c4acdc574d2aa (diff) | |
download | nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.tar nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.tar.gz nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.tar.bz2 nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.tar.lz nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.tar.xz nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.tar.zst nixpkgs-48b6f0eabb5479abc3a69c1395c2353eb73ed57d.zip |
Merge pull request #92644 from jonringer/bump-bleachbit
bleachbit: 3.2.0 -> 4.0.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/bleachbit/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 0111f8519e7..3c11c7bfaf5 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,5 +1,5 @@ { stdenv -, pythonPackages +, python3Packages , fetchurl , gettext , gobject-introspection @@ -9,15 +9,15 @@ , libnotify }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bleachbit"; - version = "3.2.0"; + version = "4.0.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1sszpn7ifiry0wwmkzdppzh61zvgrfypm9g7wk6q1ya20qhb5b51"; + sha256 = "1dn3h6lr9ldbfpvgq9sdlk972sxhwalgj2f377qbqibm3yfxzpil"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { libnotify ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ chardet pygobject3 requests @@ -51,6 +51,12 @@ pythonPackages.buildPythonApplication rec { "prefix=${placeholder "out"}" ]; + # prevent double wrapping from wrapGApps and wrapPythonProgram + dontWrapGApps = true; + makeWrapperArgs = [ + ''''${gappsWrapperArgs[@]}'' + ]; + strictDeps = false; meta = with stdenv.lib; { |