From 18d301d9dda86890bf05313cca47f18f2ddc0b4b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Thu, 14 Dec 2023 19:08:08 +0000
Subject: [PATCH] cross: dino: remove patch which has been upstreame into
 nixpkgs

---
 flake.lock         | 12 ++++++------
 overlays/cross.nix | 43 -------------------------------------------
 2 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/flake.lock b/flake.lock
index b19bd6b2c..8fca1bc14 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1702555289,
-        "narHash": "sha256-Xrc7vFfB4t7ADb4/FagrtZJlHl0qQPqPFbLp6vn0msI=",
+        "lastModified": 1702576862,
+        "narHash": "sha256-liPhhJX9mCn92QpInvAoVKn6Wmrs2Ph34Zda4XZGOAI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1aca249f1846b6bb7a156b809c312de58945c85a",
+        "rev": "248d12a902bfc36134176f31beba87b1fe30a3c1",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1702571050,
-        "narHash": "sha256-aRZSZHLmlPo/MlbtbZmg/+G0CWQslL065oEHgaA5pWY=",
+        "lastModified": 1702578284,
+        "narHash": "sha256-gGNEJDUtKWvGUA9RsQwfbL3z9e4wMOHhslvbUG3qClE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8e23dec5ac5ebc36057e980d4e6a3eb6a44da74b",
+        "rev": "fd7914c96f7c006047e0154dd239aa2396478094",
         "type": "github"
       },
       "original": {
diff --git a/overlays/cross.nix b/overlays/cross.nix
index 727367518..51c45f7fa 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -584,49 +584,6 @@ in with final; {
     strictDeps = true;
   });
 
-  # CMake Error at cmake/SoupVersion.cmake:3 (file):
-  # file Failed to run ldconfig
-  # 2023/12/08: upstreaming is our for PR: <https://github.com/NixOS/nixpkgs/pull/273189>
-  dino = prev.dino.overrideAttrs (upstream: {
-    cmakeFlags = upstream.cmakeFlags ++ [
-      "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
-      "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
-      "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
-      # "-DPKG_CONFIG_PATH=$PKG_CONFIG_PATH_TARGET"
-      # "-DUSE_SOUP3=yes"
-      "-DSOUP_VERSION=2"
-    ];
-    # preConfigure = (upstream.preConfigure or "") + ''
-    #   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH_HOST"
-    # '';
-    # nativeBuildInputs = upstream.nativeBuildInputs ++ [
-    #   glib.dev  # for glib-compile-resources
-    # ];
-    # buildInputs = upstream.buildInputs ++ [
-    #   # dino seems unable to locate transient dependencies of gio, in particular.
-    #   # something about PKG_CONFIG_PATH not being configured correctly.
-    #   # but the non-cross compiled version complains about these too,
-    #   # and everything seems to work fine without supplying them...
-    #   appstream   # for appstream.pc
-    #   elfutils    # for libdw.pc
-    #   gupnp-igd   # for gupnp-gid-1.0.pc
-    #   libdatrie   # for datrie-0.2.pc
-    #   libidn2     # for libidn2.pc
-    #   libpsl      # for libpsl.pc
-    #   libselinux  # for libselinux.pc
-    #   libsepol    # for libsepol.pc
-    #   libsysprof-capture  # for sysprof-capture-4.pc
-    #   libtasn1    # for libtasn1.pc
-    #   libthai     # for libthai.pc
-    #   libunwind   # for libunwind.pc
-    #   p11-kit     # for p11-kit-1.pc
-    #   pcre        # for libpcre.pc
-    #   util-linux  # for mount.pc
-    #   xorg.libXdmcp  # for xdmcp.pc
-    #   zstd        # for libzstd.pc
-    # ];
-  });
-
   # 2023/12/08: upstreaming is blocked on rpm
   dtrx = prev.dtrx.override {
     # `binutils` is the nix wrapper, which reads nix-related env vars