summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2023-01-08 12:09:39 +0000
committerGitHub <noreply@github.com>2023-01-08 12:09:39 +0000
commitebdd60caf62e058e909241dbc96feb776985fc2b (patch)
tree03e87f11bff346bac6ecaf7ef7eb787cbecbe652
parent1bf5934eeb71e29429b416ec453123a4891df3fe (diff)
parent7d160a3201bec5ee331a6aae94cf8f9978612635 (diff)
Merge pull request #209010 from wegank/libticables2-darwin
libticables2: unbreak on aarch64-darwin
-rw-r--r--pkgs/development/libraries/libticables2/default.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix
index 4601a66985e2..d3f2e86a964f 100644
--- a/pkgs/development/libraries/libticables2/default.nix
+++ b/pkgs/development/libraries/libticables2/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch
, pkg-config
, autoreconfHook
, glib
@@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
};
+ patches = [
+ (fetchpatch {
+ name = "add-support-for-aarch64-macos-target-triple.patch";
+ url = "https://github.com/debrouxl/tilibs/commit/ef41c51363b11521460f33e8c332db7b0a9ca085.patch";
+ stripLen = 2;
+ sha256 = "sha256-oTR1ACEZI0fjErpnFXTCnfLT1mo10Ypy0q0D8NOPNsM=";
+ })
+ ];
+
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -60,7 +70,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ siraben luc65r ];
platforms = with platforms; linux ++ darwin;
- # never built on aarch64-darwin since first introduction in nixpkgs
- broken = stdenv.isDarwin && stdenv.isAarch64;
};
}