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

xorg.xcbproto: do not depend on python2

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-15 01:50:34 +01:00
parent d58a42ad78
commit eb1d315cd8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/polybar/default.nix
+2 -3
View File
@@ -24,8 +24,7 @@ assert nlSupport -> ! iwSupport && libnl != null;
assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
let xcbproto-py3 = xcbproto.override { python = python3; }; stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
pname = "polybar"; pname = "polybar";
version = "3.4.1"; version = "3.4.1";
@@ -51,7 +50,7 @@ in stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto-py3 xcbutil cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto xcbutil
xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
(if alsaSupport then alsaLib else null) (if alsaSupport then alsaLib else null)
pkgs/servers/x11/xorg/overrides.nix
+5 -1
View File
@@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, freetype, tradcpp, fontconfig, meson, ninja, ed,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkgconfig, llvm_6, mcpp, epoxy, openssl, pkgconfig, llvm_6, python3,
ApplicationServices, Carbon, Cocoa, Xplugin ApplicationServices, Carbon, Cocoa, Xplugin
}: }:
@@ -308,6 +308,10 @@ self: super:
buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
}); });
xcbproto = super.xcbproto.override {
python = python3;
};
xcbutil = super.xcbutil.overrideAttrs (attrs: { xcbutil = super.xcbutil.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
}); });