diff options
| author | Robin Gloster <mail@glob.in> | 2019-09-13 16:43:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 16:43:13 +0200 |
| commit | b19be78a93e2c3ca865f2cf20dc06f9f34c00034 (patch) | |
| tree | 65d0fe71a779b2742e40d0947ad8d020f6b27ace | |
| parent | fac745bf16b0bfcce927bb84f623d54ca24481e5 (diff) | |
| parent | eb5497c4199464edb6a5ea12dd5ff996af1cc021 (diff) | |
| download | nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.tar nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.tar.gz nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.tar.bz2 nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.tar.lz nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.tar.xz nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.tar.zst nixpkgs-b19be78a93e2c3ca865f2cf20dc06f9f34c00034.zip | |
Merge pull request #68648 from JohnAZoidberg/fluxgui120
xflux-gui: 1.1.10 -> 1.2.0
| -rw-r--r-- | pkgs/tools/misc/xflux/gui.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 20 insertions, 19 deletions
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index f3f80143c57..6a629af61ba 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,39 +1,42 @@ -{ stdenv, fetchFromGitHub, pythonPackages -, gnome_python -, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook +{ stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +, xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk +, pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 }: -pythonPackages.buildPythonApplication rec { +buildPythonApplication rec { pname = "xflux-gui"; - version = "1.1.10"; + version = "1.2.0"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; rev = "v${version}"; - sha256 = "1k67qg9y4c0n9ih0syx81ixbdl2x89gd4arwh71316cshskn0rc8"; + sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps"; }; - propagatedBuildInputs = with pythonPackages; [ - pexpect - pyGtkGlade - pygobject2 + propagatedBuildInputs = [ pyxdg - libappindicator-gtk2 - gnome_python + pexpect + pygobject3 ]; - buildInputs = [ xflux librsvg ]; + buildInputs = [ + xflux gtk3 + ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + wrapGAppsHook gobject-introspection + pango gdk-pixbuf atk libappindicator-gtk3 + ]; postPatch = '' - substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" + substituteInPlace src/fluxgui/xfluxcontroller.py \ + --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" ''; postFixup = '' wrapGAppsHook wrapPythonPrograms - patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py + patchPythonScript $out/${python3Packages.python.sitePackages}/fluxgui/fluxapp.py ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6631306b356..d4a52e9f419 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7098,9 +7098,7 @@ in xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; xflux = callPackage ../tools/misc/xflux { }; - xflux-gui = callPackage ../tools/misc/xflux/gui.nix { - gnome_python = gnome2.gnome_python; - }; + xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; libxfs = xfsprogs.dev; |