Merge pull request #204003 from wegank/fractal-darwin

fractal: fix build on darwin
This commit is contained in:
Robert Scott 2022-12-04 00:52:13 +00:00 committed by GitHub
commit 8bd8034406
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View file

@ -92,6 +92,10 @@ stdenv.mkDerivation rec {
patchShebangs scripts/meson_post_install.py scripts/test.sh patchShebangs scripts/meson_post_install.py scripts/test.sh
''; '';
preConfigure = ''
export GETTEXT_DIR="${gettext}"
'';
passthru = { passthru = {
updateScript = nix-update-script { updateScript = nix-update-script {
attrPath = pname; attrPath = pname;
@ -103,5 +107,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/fractal"; homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]); maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]);
platforms = platforms.unix;
}; };
} }

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
"-Dintrospection=enabled" "-Dintrospection=enabled"
]; ];
doCheck = true; doCheck = !stdenv.isDarwin;
checkPhase = '' checkPhase = ''
NO_AT_BRIDGE=1 \ NO_AT_BRIDGE=1 \
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://source.puri.sm/Librem5/libhandy"; homepage = "https://source.puri.sm/Librem5/libhandy";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }