diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 6a7a8ccec06b..889155f19a6d 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -8,29 +8,28 @@ , fetchurl , pkg-config , libxml2 -, gtk3 +, gtk4 , glib -, gtksourceview4 +, gtksourceview5 , wrapGAppsHook , gobject-introspection -, python3 , gnome , mpfr , gmp , libsoup , libmpc -, libhandy +, libadwaita , gsettings-desktop-schemas , libgee }: stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AmdhSv2yXTi3hBG0Lrq3vFDBtjQMxJu2jA5DLX3fijQ="; + sha256 = "pTWhTr6ljmkaS1oIUlau0GCiw/BzhKw6PQGDIzKifko="; }; nativeBuildInputs = [ @@ -41,32 +40,25 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - python3 gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 + gtk4 glib libxml2 - gtksourceview4 + gtksourceview5 mpfr gmp - gnome.adwaita-icon-theme libgee gsettings-desktop-schemas libsoup libmpc - libhandy + libadwaita ]; doCheck = true; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - preCheck = '' # Currency conversion test tries to store currency data in $HOME/.cache. export HOME=$TMPDIR |