diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-11-25 18:20:42 +0100 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2018-11-25 18:20:42 +0100 |
commit | 9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877 (patch) | |
tree | f178cdd1be846b9c3c406ecf145ed52ccdc5f776 /pkgs/tools | |
parent | 2fbde72556c981b5005e2dbe8599b5d3adb5c13f (diff) |
confuse: remove and replace with libconfuse
- confuse is a duplicate of libconfuse - upstream name is libconfuse so keep this one - replace confuse with libconfuse in packages depending on it
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/dispad/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/bmon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/xburst-tools/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index 853feb08002c7..1d119220e5851 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXi, confuse }: +{ stdenv, fetchFromGitHub, libX11, libXi, libconfuse }: stdenv.mkDerivation rec { name = "dispad-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0y0n9mf1hs3s706gkpmg1lh74m6vvkqc9rdbzgc6s2k7vdl2zp1y"; }; - buildInputs = [ libX11 libXi confuse ]; + buildInputs = [ libX11 libXi libconfuse ]; meta = with stdenv.lib; { description = "A small daemon for disabling trackpads while typing"; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 9c7eafe351f7f..fc10538bbbbda 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, confuse +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ncurses confuse libnl ]; + buildInputs = [ ncurses libconfuse libnl ]; meta = with stdenv.lib; { description = "Network bandwidth monitor"; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index ca642035a0bbe..aad5b35c79ff3 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig +{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -28,8 +28,8 @@ stdenv.mkDerivation { # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb libusb1 autoconf automake confuse ] ++ + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ libusb libusb1 libconfuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { |