Unverified Commit 4c6a4935 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

ignition: init at 1.1.3 (#385228)

parents 4f0aff31 94dfe0d6
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
diff --git a/src/io.github.flattool.Ignition.in b/src/io.github.flattool.Ignition.in
index 5c71c3c..0b2ec00 100644
--- a/src/io.github.flattool.Ignition.in
+++ b/src/io.github.flattool.Ignition.in
@@ -1,7 +1,8 @@
-#!@GJS@ -m
+#!/usr/bin/env gjs -m
 
 import { exit, programArgs, programInvocationName } from "system";
 
+imports.package._findEffectiveEntryPointName = () => 'io.github.flattool.Ignition';
 imports.package.init({
   name: "@PACKAGE_NAME@",
   version: "@PACKAGE_VERSION@",
diff --git a/src/meson.build b/src/meson.build
index 488fa06..751f8ed 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,7 +23,6 @@ data_res = gnome.compile_resources('io.github.flattool.Ignition.data',
 )
 
 bin_conf = configuration_data()
-bin_conf.set('GJS', find_program('gjs').full_path())
 bin_conf.set('PACKAGE_VERSION', meson.project_version())
 bin_conf.set('PACKAGE_NAME', meson.project_name())
 bin_conf.set('prefix', get_option('prefix'))
+66 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,

  appstream,
  blueprint-compiler,
  desktop-file-utils,
  gettext,
  meson,
  ninja,
  pkg-config,
  wrapGAppsHook4,

  gjs,
  gtk4,
  libadwaita,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "ignition";
  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "flattool";
    repo = "ignition";
    tag = finalAttrs.version;
    hash = "sha256-XVBlwonMHb78XF6mpPYLJ68E5Tb+dFVFqNSsVCCS0xc=";
  };

  patches = [
    # Don't use find_program for detecting gjs. (we don't want to use the build-platform's gjs binary)
    # We instead rely on the fact that fixupPhase uses patchShebangs on the script.
    # Also, we manually set the effective entrypoint to make gjs properly find our binary.
    ./fix-gjs.patch
  ];

  strictDeps = true;

  nativeBuildInputs = [
    appstream
    blueprint-compiler
    desktop-file-utils
    gettext
    gtk4
    meson
    ninja
    pkg-config
    wrapGAppsHook4
  ];

  buildInputs = [
    gjs
    gtk4
    libadwaita
  ];

  meta = {
    description = "Manage startup apps and scripts";
    homepage = "https://github.com/flattool/ignition";
    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [ tomasajt ];
    mainProgram = "io.github.flattool.Ignition";
    platforms = lib.platforms.linux;
  };
})