diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-22 13:48:35 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-22 13:48:35 +0100 |
| commit | 0957359568389f4abca5d4176749cac736e7fe6f (patch) | |
| tree | 1c8d664ae5405cb2859a2e679e402dca0e597b5b /pkgs/os-specific/linux | |
| parent | 542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9 (diff) | |
| parent | 3317eef08420a1561fc42cd97d28fc3eca8c15d7 (diff) | |
| download | nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.gz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.bz2 nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.lz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.xz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.zst nixlib-0957359568389f4abca5d4176749cac736e7fe6f.zip | |
Merge branch 'staging'
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" ''; |