summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorNick Spinale <nick@nickspinale.com>2019-01-09 16:43:02 +0000
committerBjørn Forsman <bjorn.forsman@gmail.com>2019-09-15 15:36:31 +0200
commitf4951397bab4e8dbb6f8fba377d1e71bab2a7ee4 (patch)
tree05d2532f3ecb7a29575e422f6d48c80369b14c57 /pkgs/tools
parentd22575e0751340b2df0d7d21730065ded27d5501 (diff)
downloadnixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.tar
nixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.tar.gz
nixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.tar.bz2
nixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.tar.lz
nixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.tar.xz
nixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.tar.zst
nixpkgs-f4951397bab4e8dbb6f8fba377d1e71bab2a7ee4.zip
lshw: fix cross-compilation
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/system/lshw/default.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index 65c905f28c6..29c20ad8d53 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -13,11 +13,18 @@ stdenv.mkDerivation rec {
     sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
   };
 
-  patches = [ (fetchpatch {
-    # fix crash in scan_dmi_sysfs() when run as non-root
-    url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
-    sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
-  })];
+  patches = [
+    (fetchpatch {
+      # fix crash in scan_dmi_sysfs() when run as non-root
+      url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
+      sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
+    })
+    (fetchpatch {
+      # support cross-compilation
+      url = "https://github.com/lyonel/lshw/commit/8486d25cea9b68794504fbd9e5c6e294bac6cb07.patch";
+      sha256 = "08f0wnxsq0agvsc66bhc7lxvk564ir0pp8pg3cym6a621prb9lm0";
+    })
+  ];
 
   nativeBuildInputs = [ pkgconfig ];