libosinfo: externalize patches, fetch w/fetchpatch

2018-09-30 00:23:59 -05:00
parent dacdf8b6c7
commit 6058b979ab
3 changed files with 11 additions and 77 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
 , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
 }:

@@ -20,8 +20,16 @@ stdenv.mkDerivation rec {

  patches = [
    ./osinfo-db-data-dir.patch
-    ./0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
-    ./0002-db-Force-anchored-patterns-when-matching-regex.patch
+    # Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
+    # using upstream commits:
+    (fetchpatch {
+      url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
+      sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
+      sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
+    })
  ];

  postPatch = ''