diff options
| author | Will Dietz <w@wdtz.org> | 2020-01-12 17:35:08 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2020-01-12 17:35:08 -0600 |
| commit | 56d8a296bd79191f071af6a5b127f91eb5e5418e (patch) | |
| tree | 74fbfec571fbe62c92c7b4c0c2d6e27680f30b5e /pkgs/applications/misc/font-manager | |
| parent | 9997f2efb41f0702f9045e3ad5246b968d97a205 (diff) | |
| download | nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.tar nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.tar.gz nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.tar.bz2 nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.tar.lz nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.tar.xz nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.tar.zst nixpkgs-56d8a296bd79191f071af6a5b127f91eb5e5418e.zip | |
font-manager: drop included patch, removed meson flag
Diffstat (limited to 'pkgs/applications/misc/font-manager')
| -rw-r--r-- | pkgs/applications/misc/font-manager/default.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 92d52b3efc8..afa0a06d33f 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,4 +1,4 @@ -{ 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 }: @@ -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 |