diff options
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/xf86-input-mtrack/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/xf86-video-nested/default.nix | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index a4fd00e4911b..ac7e782444f5 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -1,34 +1,28 @@ { stdenv , fetchurl -, autoconf -, automake , utilmacros , pkgconfig -, libtool , mtdev , xorgserver , xproto , inputproto , pixman +, autoreconfHook }: stdenv.mkDerivation { name = "xf86-input-mtrack-0.3.0"; - preConfigure = "autoreconf -vfi"; - buildInputs = [ - autoconf - automake utilmacros pkgconfig - libtool mtdev xorgserver xproto inputproto pixman + autoreconfHook ]; CFLAGS = "-I${pixman}/include/pixman-1"; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 0d0639390a73..0f9e0591a060 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext -, libtool, pixman, pkgconfig, renderproto, utilmacros, xorgserver +{ stdenv, fetchgit, autoreconfHook, fontsproto, libX11, libXext +, pixman, pkgconfig, renderproto, utilmacros, xorgserver }: stdenv.mkDerivation { @@ -12,13 +12,12 @@ stdenv.mkDerivation { }; buildInputs = - [ autoconf automake fontsproto libX11 libXext libtool pixman + [ autoreconfHook fontsproto libX11 libXext pixman pkgconfig renderproto utilmacros xorgserver ]; configurePhase = '' - autoreconf -fvi ./configure --prefix=$out CFLAGS="-I${pixman}/include/pixman-1" ''; |