From 55bfef5e6a99e5f74a0d76017edc8ae6dae04f1c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 30 Mar 2022 14:36:12 -0700 Subject: [PATCH 1/2] DO NOT MERGE: this just to get ofborg to prove hydra wrong --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33c9614489165..ddb9f261d9a02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35080,4 +35080,6 @@ with pkgs; honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; + + this-is-a-kludge = (import ../stdenv/linux/make-bootstrap-tools-cross.nix { }).mips64el-linux-gnuabi64.build; } From 3b2176133a0881a42249f0ce785ba1995cbe49e4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 30 Mar 2022 23:35:59 -0700 Subject: [PATCH 2/2] force pcre to rebuild --- pkgs/development/libraries/pcre/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 5fc8d496ba914..39aa568e2bf4c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -42,7 +42,9 @@ stdenv.mkDerivation rec { moveToOutput bin/pcre-config "$dev" '' + optionalString (variant != null) '' ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib} - ''; + '' + (if stdenv.hostPlatform.isMips64 then '' + echo this is just to force a rebuild + '' else ""); meta = { homepage = "http://www.pcre.org/";