diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2021-09-17 12:10:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-17 12:10:44 -0500 |
commit | 0ef24f212ab3f0a05170b0f09fa5c8c766505df9 (patch) | |
tree | e605c30c640d3d2f6e2df11822ca0026bee6eb0d /pkgs/servers | |
parent | fa5933fccd4b87f26ab611ccd14aa5383a7fc8e9 (diff) | |
parent | 60761842270d76d00750ddbd0244117ed449b369 (diff) |
Merge pull request #138029 from oxalica/fix/xf86input-pc
xorg.xf86*: fix include dir
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ec43ae9d59d44..9932e46839a93 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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" ]; }); |