diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-27 20:14:06 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-04-27 22:04:53 -0500 |
| commit | 9540f359210776fcb9b5eba0ca72f8d87410195a (patch) | |
| tree | cc0cf988f146291f23e0c9027709bd09cb53286a /pkgs | |
| parent | c8eb0321fa04ba65ec72e05db56657831eb813fe (diff) | |
| download | nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.tar nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.tar.gz nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.tar.bz2 nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.tar.lz nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.tar.xz nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.tar.zst nixpkgs-9540f359210776fcb9b5eba0ca72f8d87410195a.zip | |
font-manager: drop included patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/font-manager/correct-post-install.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/misc/font-manager/default.nix | 4 |
2 files changed, 0 insertions, 17 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 47e9800d265..00000000000 --- 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 aa8f00f2d2b..f00d6cfc60d 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -38,10 +38,6 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - patches = [ - ./correct-post-install.patch - ]; - mesonFlags = [ "-Ddisable_pycompile=true" ]; |