diff options
author | Robert Schütz <nix@dotlambda.de> | 2021-10-02 18:30:11 -0700 |
---|---|---|
committer | Robert Schütz <nix@dotlambda.de> | 2021-10-14 09:11:26 -0700 |
commit | 28331311a337023fcc38cd4ad0c0d9a30ddcb67b (patch) | |
tree | 8313d6c3f050a57daab8dfbba97e38a0c38b7619 /pkgs/development/libraries/libadwaita | |
parent | b6ba0f59ca8ce1f809613e22b39a26dc0ea3b406 (diff) | |
download | nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.tar nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.tar.gz nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.tar.bz2 nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.tar.lz nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.tar.xz nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.tar.zst nixpkgs-28331311a337023fcc38cd4ad0c0d9a30ddcb67b.zip |
libadwaita: 1.0.0-alpha.2 -> 1.0.0.alpha.3
Diffstat (limited to 'pkgs/development/libraries/libadwaita')
-rw-r--r-- | pkgs/development/libraries/libadwaita/default.nix | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 405598c6964..5889c6ee3ac 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -12,13 +12,16 @@ , vala , gobject-introspection , fribidi +, glib , gtk4 +, gnome +, gsettings-desktop-schemas , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.0-alpha.2"; + version = "1.0.0.alpha.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "1yvjdzs5ipmr4gi0l4k6dkqhl9b090kpjc3ll8bv1a6i7yfaf53s"; + sha256 = "sha256-4ED2m8hZMWbu5sFbkH0W6q05+cYCCkx+ubeDqg3W3a0="; }; nativeBuildInputs = [ @@ -54,13 +57,31 @@ stdenv.mkDerivation rec { ]; checkInputs = [ + gnome.adwaita-icon-theme xvfb-run ]; doCheck = true; checkPhase = '' - xvfb-run meson test + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + ADW_DISABLE_PORTAL=1 + + # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 + "XDG_DATA_DIRS=${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Tests need a cache directory + "HOME=$TMPDIR" + ) + env "''${testEnvironment[@]}" xvfb-run \ + meson test --print-errorlogs + + runHook postCheck ''; postInstall = '' |