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/os-specific | |
parent | 2fbde72556c981b5005e2dbe8599b5d3adb5c13f (diff) | |
download | nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.tar nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.tar.gz nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.tar.bz2 nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.tar.lz nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.tar.xz nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.tar.zst nixpkgs-9762e2c3bd28d01a12c8fb5ecd70c91b2a4f4877.zip |
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/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/pommed-light/default.nix | 20 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udisks-glue/default.nix | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 3ee5e312d23..06ea49034a0 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -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 ]; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 56e237a9fad..37af3c92ea5 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -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; }; } |