From 354e6f4fd1a79f62540ef2a01b3f89880b6cdb9c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 16 Sep 2025 21:05:28 +0800 Subject: [PATCH] nemo-seahorse: Remove update script & cmake, simplify https://github.com/jtojnar/nixpkgs-hammering/blob/main/explanations/meson-cmake.md --- pkgs/by-name/ne/nemo-seahorse/fix-schemas.patch | 16 ---------------- pkgs/by-name/ne/nemo-seahorse/package.nix | 12 +++++------- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 pkgs/by-name/ne/nemo-seahorse/fix-schemas.patch diff --git a/pkgs/by-name/ne/nemo-seahorse/fix-schemas.patch b/pkgs/by-name/ne/nemo-seahorse/fix-schemas.patch deleted file mode 100644 index 8f88d468acf7..000000000000 --- a/pkgs/by-name/ne/nemo-seahorse/fix-schemas.patch +++ /dev/null @@ -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') diff --git a/pkgs/by-name/ne/nemo-seahorse/package.nix b/pkgs/by-name/ne/nemo-seahorse/package.nix index 6c829fadc151..ff56deb0ad65 100644 --- a/pkgs/by-name/ne/nemo-seahorse/package.nix +++ b/pkgs/by-name/ne/nemo-seahorse/package.nix @@ -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";