Merge pull request #68648 from JohnAZoidberg/fluxgui120
xflux-gui: 1.1.10 -> 1.2.0
This commit is contained in:
commit
b19be78a93
@ -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 = {
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user