Merge pull request #184297 from wegank/libadwaita-darwin
libadwaita, gnome-text-editor: add darwin support
This commit is contained in:
commit
2f8a2a493f
|
@ -17,6 +17,8 @@
|
||||||
, gnome
|
, gnome
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, xvfb-run
|
, xvfb-run
|
||||||
|
, AppKit
|
||||||
|
, Foundation
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -48,11 +50,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dgtk_doc=true"
|
"-Dgtk_doc=true"
|
||||||
|
] ++ lib.optionals (!doCheck) [
|
||||||
|
"-Dtests=false"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
fribidi
|
fribidi
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
AppKit
|
||||||
|
Foundation
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -61,10 +68,15 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
gnome.adwaita-icon-theme
|
gnome.adwaita-icon-theme
|
||||||
|
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||||
xvfb-run
|
xvfb-run
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
# Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra:
|
||||||
|
#
|
||||||
|
# In file included from ../tests/test-style-manager.c:10:
|
||||||
|
# ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found
|
||||||
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
runHook preCheck
|
runHook preCheck
|
||||||
|
@ -81,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||||
# Tests need a cache directory
|
# Tests need a cache directory
|
||||||
"HOME=$TMPDIR"
|
"HOME=$TMPDIR"
|
||||||
)
|
)
|
||||||
env "''${testEnvironment[@]}" xvfb-run \
|
env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \
|
||||||
meson test --print-errorlogs
|
meson test --print-errorlogs
|
||||||
|
|
||||||
runHook postCheck
|
runHook postCheck
|
||||||
|
@ -102,6 +114,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://gitlab.gnome.org/GNOME/libadwaita";
|
homepage = "https://gitlab.gnome.org/GNOME/libadwaita";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]);
|
maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]);
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18667,7 +18667,9 @@ with pkgs;
|
||||||
|
|
||||||
libad9361 = callPackage ../development/libraries/libad9361 { };
|
libad9361 = callPackage ../development/libraries/libad9361 { };
|
||||||
|
|
||||||
libadwaita = callPackage ../development/libraries/libadwaita { };
|
libadwaita = callPackage ../development/libraries/libadwaita {
|
||||||
|
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation;
|
||||||
|
};
|
||||||
|
|
||||||
libaec = callPackage ../development/libraries/libaec { };
|
libaec = callPackage ../development/libraries/libaec { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue