diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-28 05:49:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-28 05:49:55 -0400 |
| commit | ebc9db29d757dfb83c0bd7c6af3ef773e70f399f (patch) | |
| tree | a594bdbcaf41460ca328b7d835f6884a15032b8d /pkgs/applications | |
| parent | a210440959209b14c8bc0ca965a03377ee7e8934 (diff) | |
| parent | 9540f359210776fcb9b5eba0ca72f8d87410195a (diff) | |
Merge pull request #60352 from dtzWill/fix/fontmanager-0.7.5
font-manager: "0.7.5" -> actual 0.7.5
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/font-manager/correct-post-install.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/misc/font-manager/default.nix | 8 |
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/applications/misc/font-manager/correct-post-install.patch b/pkgs/applications/misc/font-manager/correct-post-install.patch deleted file mode 100644 index 47e9800d26571..0000000000000 --- a/pkgs/applications/misc/font-manager/correct-post-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson_post_install.py b/meson_post_install.py -index 8d00e70..c28d19e 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -7,7 +7,7 @@ prefix = environ['MESON_INSTALL_PREFIX'] - data_dir = path.join(prefix, 'share') - schema_dir = path.join(data_dir, 'glib-2.0', 'schemas') - --if not environ['DESTDIR']: -+if not environ.get('DESTDIR'): - print('Compiling gsettings schemas...') - call(['glib-compile-schemas', schema_dir]) - print('Updating desktop database...') diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index f8a02d2f78c63..f00d6cfc60da0 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "FontManager"; repo = "master"; - rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3"; - sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0"; + rev = version; + sha256 = "16hma8rrkam6ngn5vbdaryn31vdixvii6920g9z928gylz9xkd3g"; }; nativeBuildInputs = [ @@ -38,10 +38,6 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - patches = [ - ./correct-post-install.patch - ]; - mesonFlags = [ "-Ddisable_pycompile=true" ]; |