From 9097b9e34a80bfa43bb6af5964f88fc65ac7ebf9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 18 Feb 2017 11:35:02 +0800 Subject: [PATCH] usb-modeswitch: 2.2.1 -> 2.5.0 We were carrying v2.2.1 and not v2.3.0 due to the update only touching the version and not the sha256 sum. --- .../tools/misc/usb-modeswitch/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 893df94d237..8a1ce7c0886 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,31 +1,32 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: -let - version = "2.3.0"; -in - stdenv.mkDerivation rec { name = "usb-modeswitch-${version}"; + version = "2.5.0"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "1jqih1g0y78w03rchpw7fjvzwjfakak61qjp7hbr1m5nnsh2dn9p"; + url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + sha256 = "0cvnd16n2sp3w46fy507nl29q39jxxdk5qqbvk1rxaa91llbxh1i"; }; + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=$(out)" + ]; + # make clean: we always build from source. It should be necessary on x86_64 only preConfigure = '' find -type f | xargs sed 's@/bin/rm@rm@g' -i make clean - mkdir -p $out/{etc,lib/udev,share/man/man1} - makeFlags="DESTDIR=$out PREFIX=$out" ''; - buildInputs = [ pkgconfig libusb1 ]; + buildInputs = [ libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "A mode switching tool for controlling 'multi-mode' USB devices"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ marcweber peterhoeg ]; + platforms = platforms.linux; }; }