summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-10-26 21:20:27 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-10-26 21:22:25 +0200
commiteadd0868343fc0b97a3452b6c8e488ffeeaede16 (patch)
tree327c4469a529e518c5537d4f5616d349a7a90d19 /pkgs/os-specific/linux
parent45a419ab5a23c93421c18f3d9cde015ded22e712 (diff)
downloadnixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.tar
nixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.tar.gz
nixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.tar.bz2
nixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.tar.lz
nixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.tar.xz
nixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.tar.zst
nixlib-eadd0868343fc0b97a3452b6c8e488ffeeaede16.zip
hwdata: 0.314 → 0.316
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/hwdata/default.nix8
-rw-r--r--pkgs/os-specific/linux/usbutils/default.nix2
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 5943ced2f8f9..dfca87e27165 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
-  version = "0.314";
+  version = "0.316";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90";
+    sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb";
   };
 
   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)
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb";
+  outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww";
 
   meta = {
     homepage = https://github.com/vcrhonek/hwdata;
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 657d6cc24a8d..8d53756d5101 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   postInstall =
     ''
       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; {