diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-03 04:44:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 04:44:07 +0100 |
| commit | c8e95c01f07b3f765d958dcc35b091478932d077 (patch) | |
| tree | e10a9fb9d18364836015b519eddd2966fe5db911 | |
| parent | 9125a8b5c8d3e00eeb7b7fd5cfc49b019f766196 (diff) | |
| parent | 9ac7f9b9ef54ba0c3dc9107a412c076ad849d996 (diff) | |
Merge pull request #204130 from wegank/qt3d-aarch64-darwin
| -rw-r--r-- | pkgs/applications/misc/sioyek/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qt3d.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 2dc82b55df7c8..bfa0fb1d50559 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -78,6 +78,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; }; }) diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index 63a516476f278..918eba5b71072 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -1,7 +1,9 @@ -{ qtModule, qtbase, qtdeclarative }: +{ lib, stdenv, qtModule, qtbase, qtdeclarative }: qtModule { pname = "qt3d"; qtInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; + # error: use of undeclared identifier 'stat64' + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; } |