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

Merge pull request #49183 from jtojnar/gusb

Browse Source 
gusb: 0.2.11 → 0.3.0
This commit is contained in:
Jan Tojnar 2018-10-26 22:54:04 +02:00 committed by GitHub
commit df9290f2fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/development/libraries/gusb/default.nix
View File

@ -1,30 +1,38 @@
{stdenv, fetchurl { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection
, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
, glib, systemd, libusb1, vala_0_38 , glib, systemd, libusb1, vala, hwdata
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gusb-${version}"; name = "gusb-${version}";
version = "0.2.11"; version = "0.3.0";
enableParallelBuilding = true;
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq";
}; };
preConfigure = "./autogen.sh"; nativeBuildInputs = [
meson ninja pkgconfig gettext
nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
gobjectIntrospection libxslt vala_0_38 ]; gobjectIntrospection vala
buildInputs = [ systemd glib ]; ];
buildInputs = [ systemd glib ];
propagatedBuildInputs = [ libusb1 ]; propagatedBuildInputs = [ libusb1 ];
meta = { mesonFlags = [
"-Dusb_ids=${hwdata}/share/hwdata/usb.ids"
];
doCheck = false; # tests try to access USB
meta = with stdenv.lib; {
description = "GLib libusb wrapper"; description = "GLib libusb wrapper";
homepage = https://people.freedesktop.org/~hughsient/releases/; homepage = https://github.com/hughsie/libgusb;
license = stdenv.lib.licenses.lgpl21; license = licenses.lgpl21;
maintainers = [stdenv.lib.maintainers.marcweber]; maintainers = [ maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/development/libraries/libosinfo/default.nix
View File

@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
"--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
"--enable-gtk-doc" "--enable-gtk-doc"
]; ];

8
pkgs/os-specific/linux/hwdata/default.nix
View File

@ -2,24 +2,24 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hwdata-${version}"; name = "hwdata-${version}";
version = "0.314"; version = "0.316";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vcrhonek"; owner = "vcrhonek";
repo = "hwdata"; repo = "hwdata";
rev = "v${version}"; rev = "v${version}";
sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb";
}; };
preConfigure = "patchShebangs ./configure"; preConfigure = "patchShebangs ./configure";
configureFlags = [ "--datadir=$(prefix)/data" ]; configureFlags = [ "--datadir=${placeholder "out"}/share" ];
doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww";
meta = { meta = {
homepage = https://github.com/vcrhonek/hwdata; homepage = https://github.com/vcrhonek/hwdata;

2
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postInstall = postInstall =
'' ''
substituteInPlace $out/bin/lsusb.py \ substituteInPlace $out/bin/lsusb.py \
--replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -9842,9 +9842,7 @@ with pkgs;
gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {};
gusb = callPackage ../development/libraries/gusb { gusb = callPackage ../development/libraries/gusb { };
inherit (gnome2) gtkdoc;
};
qt-mobility = callPackage ../development/libraries/qt-mobility {}; qt-mobility = callPackage ../development/libraries/qt-mobility {};