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
This commit is contained in:
c0bw3b
2018-11-25 18:20:42 +01:00
parent 2fbde72556
commit 9762e2c3bd
10 changed files with 32 additions and 51 deletions

View File

@@ -1,8 +1,7 @@
{
stdenv
, fetchurl
{ stdenv
, fetchFromGitHub
, pciutils
, confuse
, libconfuse
, alsaLib
, audiofile
, pkgconfig
@@ -15,10 +14,11 @@ stdenv.mkDerivation rec {
version = "1.51lw";
name = "${pkgname}-${version}";
src = fetchurl {
url = "https://github.com/bytbox/${pkgname}/archive/v${version}.tar.gz";
sha256 = "11wi17bh2br1hp8gmq40b1hm5drm6h969505f7432zam3cm8mc8q";
src = fetchFromGitHub {
owner = "bytbox";
repo = pkgname;
rev = "v${version}";
sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy";
};
postPatch = ''
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
pciutils
confuse
libconfuse
alsaLib
audiofile
pkgconfig
zlib
eject
];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, confuse }:
{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
stdenv.mkDerivation {
name = "udisks-glue-1.3.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig automake autoconf ];
buildInputs = [ udisks1 dbus-glib glib confuse ];
buildInputs = [ udisks1 dbus-glib glib libconfuse ];
preConfigure = "sh autogen.sh";
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
description = "A tool to associate udisks events to user-defined actions";
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [pSub];
license = stdenv.lib.licenses.free;
license = stdenv.lib.licenses.bsd2;
};
}