public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/14133'

Browse Source 
Applied some fixes. Closes #14133
This commit is contained in:
zimbatm 2016-05-10 22:00:58 +01:00
commit 9adb332c6d
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/tools/misc/usb-modeswitch/data.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, libusb1, usb-modeswitch }:
let
version = "20160112";
in
stdenv.mkDerivation rec {
name = "usb-modeswitch-data-${version}";
src = fetchurl {
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
sha256 = "19yzqv0592b9mwgdi7apzw881q70ajyx5d56zr1z5ldi915a8yfn";
};
# make clean: we always build from source. It should be necessary on x86_64 only
prePatch = ''
sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules
sed -i "1 i\DESTDIR=$out" Makefile
'';
buildInputs = [ pkgconfig libusb1 usb-modeswitch ];
meta = {
description = "device database and the rules file for 'multi-mode' USB devices";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/development/tools/misc/usb-modeswitch/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }: { stdenv, fetchurl, pkgconfig, libusb1 }:
let let
version = "2.2.1"; version = "2.3.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig libusb1 ]; buildInputs = [ pkgconfig libusb1 ];
meta = { meta = {
description = "a mode switching tool for controlling 'multi-mode' USB devices";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

1
pkgs/top-level/aliases.nix
View File

@ -99,6 +99,7 @@ doNotDisplayTwice rec {
system_config_printer = system-config-printer; # added 2016-01-03 system_config_printer = system-config-printer; # added 2016-01-03
telepathy_qt5 = qt5.telepathy; # added 2015-12-19 telepathy_qt5 = qt5.telepathy; # added 2015-12-19
tftp_hpa = tftp-hpa; # added 2015-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03
usb_modeswitch = usb-modeswitch; # added 2016-05-10
vimbWrapper = vimb; # added 2015-01 vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24 virtviewer = virt-viewer; # added 2015-12-24

3
pkgs/top-level/all-packages.nix
View File

@ -1068,7 +1068,8 @@ in
"unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { }; "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };
anthy = callPackage ../tools/inputmethods/anthy { }; anthy = callPackage ../tools/inputmethods/anthy { };