nemo-seahorse: Remove update script & cmake, simplify (#443344)
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -1,10 +1,13 @@
|
||||
dataconf = configuration_data()
|
||||
dataconf.set('VERSION', meson.project_version())
|
||||
|
||||
+schemadir = get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
|
||||
+
|
||||
install_data(
|
||||
'org.nemo.plugins.seahorse.gschema.xml',
|
||||
'org.nemo.plugins.seahorse.window.gschema.xml',
|
||||
install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
|
||||
)
|
||||
|
||||
+meson.add_install_script('glib-compile-schemas', schemadir)
|
||||
install_man('nemo-seahorse-tool.1')
|
||||
@@ -8,14 +8,12 @@
|
||||
glib,
|
||||
gtk3,
|
||||
nemo,
|
||||
cmake,
|
||||
dbus-glib,
|
||||
libcryptui,
|
||||
gcr,
|
||||
libnotify,
|
||||
gnupg,
|
||||
gpgme,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -31,13 +29,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "${src.name}/nemo-seahorse";
|
||||
|
||||
patches = [ ./fix-schemas.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
pkg-config
|
||||
ninja
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -52,9 +48,11 @@ stdenv.mkDerivation rec {
|
||||
gnupg
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}";
|
||||
postInstall = ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
env.PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-seahorse";
|
||||
|
||||
Reference in New Issue
Block a user