public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xflux-gui: 1.1.10 -> 1.2.0

Browse Source 
Didn't build with the old version because they dropped Python2 and
changed some dependencies.
This commit is contained in:
Daniel Schaefer 2019-09-13 13:30:02 +02:00
parent 7858f5add5
commit eb5497c419
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/tools/misc/xflux/gui.nix
View File

@ -1,39 +1,42 @@
{ stdenv, fetchFromGitHub, pythonPackages { stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
, gnome_python , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk
, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3
}: }:
pythonPackages.buildPythonApplication rec { buildPythonApplication rec {
pname = "xflux-gui"; pname = "xflux-gui";
version = "1.1.10"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "xflux-gui"; repo = "xflux-gui";
owner = "xflux-gui"; owner = "xflux-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1k67qg9y4c0n9ih0syx81ixbdl2x89gd4arwh71316cshskn0rc8"; sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps";
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = [
pexpect
pyGtkGlade
pygobject2
pyxdg pyxdg
libappindicator-gtk2 pexpect
gnome_python pygobject3
]; ];
buildInputs = [ xflux librsvg ]; buildInputs = [
xflux gtk3
];
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [
wrapGAppsHook gobject-introspection
pango gdk-pixbuf atk libappindicator-gtk3
];
postPatch = '' 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 = '' postFixup = ''
wrapGAppsHook wrapGAppsHook
wrapPythonPrograms wrapPythonPrograms
patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py patchPythonScript $out/${python3Packages.python.sitePackages}/fluxgui/fluxapp.py
''; '';
meta = { meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -7098,9 +7098,7 @@ in
xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
xflux = callPackage ../tools/misc/xflux { }; xflux = callPackage ../tools/misc/xflux { };
xflux-gui = callPackage ../tools/misc/xflux/gui.nix { xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
gnome_python = gnome2.gnome_python;
};
xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
libxfs = xfsprogs.dev; libxfs = xfsprogs.dev;