From 6a10c72d90a50e73171a8b9963a67407962e1c16 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 16 Jul 2021 16:27:33 +0200 Subject: xf86_input_wacom: fix build I suspect that some of the stdenv changes (PR #127736 maybe?) affected how the newline was handled. Anyway, it was ugly, so let's use a more standard approach. --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/os-specific/linux/xf86-input-wacom') diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 34cfd58ab4b..5f4434c0a6b 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -45,13 +45,11 @@ stdenv.mkDerivation rec { xorgserver ]; - preConfigure = '' - mkdir -p $out/share/X11/xorg.conf.d - configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules - --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" - ''; - - CFLAGS = "-I${pixman}/include/pixman-1"; + configureFlags = [ + "--with-xorg-module-dir=$(out)/lib/xorg/modules" + "--with-sdkdir=$(out)/include/xorg" + "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" + ]; meta = with lib; { maintainers = with maintainers; [ goibhniu fortuneteller2k ]; -- cgit 1.4.1