Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7aa6616d005d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae0239c28b01
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2020

  1. font-manager: 0.7.5 -> 0.7.7 

    https://github.com/FontManager/font-manager/releases/tag/0.7.6
https://github.com/FontManager/font-manager/releases/tag/0.7.7
    @dtzWill
    dtzWill committed Jan 12, 2020
    Copy the full SHA
    9997f2e View commit details

  2. font-manager: drop included patch, removed meson flag

    @dtzWill
    dtzWill committed Jan 12, 2020
    Copy the full SHA
    56d8a29 View commit details

Commits on Jan 13, 2020

  1. Merge pull request #77586 from dtzWill/update/font-manager-0.7.7 

    font-manager: 0.7.5 -> 0.7.7
    @romildo
    romildo authored Jan 13, 2020
    Copy the full SHA
    ae0239c View commit details
Showing with 3 additions and 16 deletions.
  1. +3 −16 pkgs/applications/misc/font-manager/default.nix
19 changes: 3 additions & 16 deletions pkgs/applications/misc/font-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}:

stdenv.mkDerivation rec {
pname = "font-manager";
version = "0.7.5";
version = "0.7.7";

src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
rev = version;
sha256 = "16hma8rrkam6ngn5vbdaryn31vdixvii6920g9z928gylz9xkd3g";
sha256 = "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f";
};

nativeBuildInputs = [
@@ -38,19 +38,6 @@ stdenv.mkDerivation rec {
gnome3.adwaita-icon-theme
];

mesonFlags = [
"-Ddisable_pycompile=true"
];

patches = [
# fix build with Vala 0.46
(fetchpatch {
url = "https://github.com/FontManager/font-manager/commit/c73b40de11f376f4515a0edfe97fb3721a264b35.patch";
sha256 = "0lacwsifgvda2r3z6j2a0svdqr6mgav7zkvih35xa8155y8wfpnw";
excludes = [ "fedora/font-manager.spec" ];
})
];

postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py