JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #196452 from wegank/gnome-apps-darwin

Browse Source 
gjs: add darwin support
This commit is contained in:
Jan Tojnar 2022-10-18 09:20:13 +02:00 committed by GitHub
commit 2792334022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome/apps/gnome-maps/default.nix
View File

@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
description = "A map application for GNOME 3"; description = "A map application for GNOME 3";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

8
pkgs/desktops/gnome/apps/gnome-weather/default.nix
View File

@ -5,7 +5,7 @@
, gnome , gnome
, gtk4 , gtk4
, libadwaita , libadwaita
, wrapGAppsHook , wrapGAppsHook4
, gjs , gjs
, gobject-introspection , gobject-introspection
, libgweather , libgweather
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
meson meson
ninja ninja
wrapGAppsHook wrapGAppsHook4
python3 python3
gobject-introspection gobject-introspection
gjs gjs
@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
chmod +x meson_post_install.py chmod +x meson_post_install.py
patchShebangs meson_post_install.py patchShebangs meson_post_install.py
substituteInPlace meson_post_install.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
''; '';
passthru = { passthru = {
@ -70,6 +72,6 @@ stdenv.mkDerivation rec {
description = "Access current weather conditions and forecasts"; description = "Access current weather conditions and forecasts";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

6
pkgs/development/libraries/gjs/default.nix
View File

@ -79,9 +79,11 @@ in stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dinstalled_test_prefix=${placeholder "installedTests"}"
] ++ lib.optionals (!stdenv.isLinux) [
"-Dprofiler=disabled"
]; ];
doCheck = true; doCheck = !stdenv.isDarwin;
postPatch = '' postPatch = ''
patchShebangs build/choose-tests-locale.sh patchShebangs build/choose-tests-locale.sh
@ -139,6 +141,6 @@ in stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/development/libraries/libshumate/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
"-Ddemos=true" "-Ddemos=true"
]; ];
doCheck = true; doCheck = !stdenv.isDarwin;
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/libshumate"; homepage = "https://gitlab.gnome.org/GNOME/libshumate";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }