diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-06 22:33:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-06 22:33:23 -0400 |
| commit | 80046ccd9683278b69377dda47c1b9439b482a45 (patch) | |
| tree | 8f3cd848d4697c15767255b704183a890f9b9316 /pkgs/applications/window-managers | |
| parent | 55cf1a5bf7e121411e3928b68b9686929c66428f (diff) | |
| parent | 094aa7bd9d6fe59df532b9ac12ac97d8791a5705 (diff) | |
| download | nixlib-80046ccd9683278b69377dda47c1b9439b482a45.tar nixlib-80046ccd9683278b69377dda47c1b9439b482a45.tar.gz nixlib-80046ccd9683278b69377dda47c1b9439b482a45.tar.bz2 nixlib-80046ccd9683278b69377dda47c1b9439b482a45.tar.lz nixlib-80046ccd9683278b69377dda47c1b9439b482a45.tar.xz nixlib-80046ccd9683278b69377dda47c1b9439b482a45.tar.zst nixlib-80046ccd9683278b69377dda47c1b9439b482a45.zip | |
Merge pull request #41006 from romildo/fix.openbox
openbox: fix wrapping of openbox-xdg-autostart
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/openbox/default.nix | 20 |
1 files 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 = { |