Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b47873026c7e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab0adc24cc51
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 17, 2020

  1. openbox: Use python3 instead of python2 (#87846)

    @SFrijters
    SFrijters authored May 17, 2020
    Copy the full SHA
    ab0adc2 View commit details
Showing with 14 additions and 3 deletions.
  1. +14 −3 pkgs/applications/window-managers/openbox/default.nix
17 changes: 14 additions & 3 deletions pkgs/applications/window-managers/openbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python2
{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3
, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM
, imlib2, pango, libstartup_notification, makeWrapper }:

@@ -7,22 +7,24 @@ stdenv.mkDerivation rec {
version = "3.6.1";

nativeBuildInputs = [
autoreconfHook
pkgconfig
makeWrapper
python2.pkgs.wrapPython
python3.pkgs.wrapPython
];

buildInputs = [
libxml2
libXinerama libXcursor libXau libXrandr libICE libSM
libstartup_notification
python3
];

propagatedBuildInputs = [
pango imlib2
];

pythonPath = with python2.pkgs; [
pythonPath = with python3.pkgs; [
pyxdg
];

@@ -36,6 +38,15 @@ stdenv.mkDerivation rec {
sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv";
};

patches = [
# Use fetchurl to avoid "fetchpatch: ignores file renames" #32084
# This patch adds python3 support
(fetchurl {
url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0";
sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc";
})
];

postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc";

# Openbox needs XDG_DATA_DIRS set or it can't find its default theme