nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 05:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138029 from oxalica/fix/xf86input-pc

Browse Source 
xorg.xf86*: fix include dir
This commit is contained in:
Thomas Tuegel 2021-09-17 12:10:44 -05:00 committed by GitHub
commit 0ef24f212a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/lxqt/lxqt-config/default.nix
View File

@ -51,10 +51,6 @@ mkDerivation rec {
xorg.xf86inputlibinput.dev
];
postPatch = ''
sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt
'';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
meta = with lib; {

6
pkgs/desktops/plasma-5/plasma-desktop/default.nix
View File

@ -40,14 +40,8 @@ mkDerivation {
sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp
'';
CXXFLAGS = [
"-I${lib.getDev xorgserver}/include/xorg"
"-I${lib.getDev xf86inputsynaptics}/include/xorg"
''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
];
cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
"-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg"
];
postInstall = ''
# Display ~/Desktop contents on the desktop by default.
sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \

22
pkgs/servers/x11/xorg/overrides.nix
View File

@ -367,35 +367,35 @@ self: super:
xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
installFlags = [
"sdkdir=${placeholder "out"}/include/xorg"
configureFlags = [
"--with-sdkdir=${placeholder "dev"}/include/xorg"
];
});
xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
installFlags = [
"sdkdir=${placeholder "out"}/include/xorg"
configureFlags = [
"--with-sdkdir=${placeholder "out"}/include/xorg"
];
});
xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
installFlags = [
"sdkdir=${placeholder "out"}/include/xorg"
configureFlags = [
"--with-sdkdir=${placeholder "out"}/include/xorg"
];
});
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
installFlags = [
"sdkdir=${placeholder "dev"}/include/xorg"
configureFlags = [
"--with-sdkdir=${placeholder "dev"}/include/xorg"
];
});
xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
installFlags = [
"sdkdir=${placeholder "out"}/include/xorg"
"configdir=${placeholder "out"}/share/X11/xorg.conf.d"
configureFlags = [
"--with-sdkdir=${placeholder "dev"}/include/xorg"
"--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
];
});