diff options
author | Bobby Rong <rjl931189261@126.com> | 2021-12-30 16:32:57 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-30 16:32:57 +0800 |
commit | 6604f227796d2670a66813642752f7afa3dc5687 (patch) | |
tree | 5a5d241a209bc2fc5f1fe2a472bc55ea0b017b80 | |
parent | 8374e8a380095b2661d9db0e9ff7e1c49f381f88 (diff) | |
parent | 97e288ac488dc687994f904b22cf029ee278acae (diff) |
Merge pull request #151977 from NickCao/libb64
libb64: fix cross compilation
-rw-r--r-- | pkgs/development/libraries/libb64/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 81ba4263a1d6..987a36cd79fe 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch"; sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf"; }) - ]; + ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { + name = "0001-example-Do-not-run-the-tests.patch"; + url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; + sha256 = "sha256-KTsiIWJe66BKlu/A43FWfW0XAu4E7lWX/RY4NITRrm4="; + }); enableParallelBuilding = true; |