From 094aa7bd9d6fe59df532b9ac12ac97d8791a5705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 23 May 2018 21:09:54 -0300 Subject: [PATCH] openbox: fix wrapping of openbox-xdg-autostart --- .../window-managers/openbox/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index ead78bf4efd9..8c6926dd2c69 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { name = "openbox-${version}"; version = "3.6.1"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libxml2 - libXinerama libXcursor libXau libXrandr libICE libSM - libstartup_notification makeWrapper + nativeBuildInputs = [ + pkgconfig + makeWrapper python2.pkgs.wrapPython ]; - pythonPath = with python2.pkgs; [ - pyxdg + buildInputs = [ + libxml2 + libXinerama libXcursor libXau libXrandr libICE libSM + libstartup_notification ]; propagatedBuildInputs = [ pango imlib2 ]; + pythonPath = with python2.pkgs; [ + pyxdg + ]; + src = fetchurl { url = "http://openbox.org/dist/openbox/${name}.tar.gz"; sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share" - wrapPythonPrograms + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" ''; meta = {