Merge pull request #60352 from dtzWill/fix/fontmanager-0.7.5

font-manager: "0.7.5" -> actual 0.7.5
This commit is contained in:
worldofpeace 2019-04-28 05:49:55 -04:00 committed by GitHub
commit ebc9db29d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 19 deletions

View file

@ -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...')

View file

@ -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"
];