diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-16 16:27:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-16 16:31:48 +0200 |
| commit | 6a10c72d90a50e73171a8b9963a67407962e1c16 (patch) | |
| tree | 4f5c3b83cfb5e38c6f0027424927fa349644915d /pkgs/os-specific/linux/xf86-input-wacom | |
| parent | 2a44031d56f6cf8707d65a17bc9a7777a03dfa61 (diff) | |
| download | nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.tar nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.tar.gz nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.tar.bz2 nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.tar.lz nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.tar.xz nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.tar.zst nixpkgs-6a10c72d90a50e73171a8b9963a67407962e1c16.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux/xf86-input-wacom')
| -rw-r--r-- | pkgs/os-specific/linux/xf86-input-wacom/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
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 ]; |