diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-12 20:26:50 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-12 20:26:50 +0200 |
| commit | bd657a72932e8605d3d889fb47f0f33da420f516 (patch) | |
| tree | 61d523d94c3a402a0dcf2e0ef064f075c2f82591 | |
| parent | bfdd9d2e664a4b28fa7966b39af0de2ea41d8926 (diff) | |
| download | nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.tar nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.tar.gz nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.tar.bz2 nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.tar.lz nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.tar.xz nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.tar.zst nixpkgs-bd657a72932e8605d3d889fb47f0f33da420f516.zip | |
libtsm: use autoreconfHook
| -rw-r--r-- | pkgs/development/libraries/libtsm/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index dc9e1d01df4..9ba25f33282 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }: +{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "libtsm-3"; @@ -8,13 +8,9 @@ stdenv.mkDerivation rec { sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; - buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ - autoconf automake - ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - aclocal - ''; + buildInputs = [ libxkbcommon pkgconfig ] ++ stdenv.isDarwin [ + autoreconfHook + ]; configureFlags = [ "--disable-debug" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ca36c590e8..0185584e80e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9229,9 +9229,7 @@ with pkgs; libtap = callPackage ../development/libraries/libtap { }; - libtsm = callPackage ../development/libraries/libtsm { - automake = automake114x; - }; + libtsm = callPackage ../development/libraries/libtsm { }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; |