diff --git a/pkgs/by-name/ig/ignition/fix-gjs.patch b/pkgs/by-name/ig/ignition/fix-gjs.patch index 312042bb5b1c..f8dfae3ef9f6 100644 --- a/pkgs/by-name/ig/ignition/fix-gjs.patch +++ b/pkgs/by-name/ig/ignition/fix-gjs.patch @@ -1,22 +1,24 @@ diff --git a/src/io.github.flattool.Ignition.in b/src/io.github.flattool.Ignition.in -index 5c71c3c..0b2ec00 100644 +index 40b474b..e8e5cd7 100755 --- a/src/io.github.flattool.Ignition.in +++ b/src/io.github.flattool.Ignition.in -@@ -1,7 +1,8 @@ +@@ -1,9 +1,10 @@ -#!@GJS@ -m +#!/usr/bin/env gjs -m - import { exit, programArgs, programInvocationName } from "system"; + import Gio from "gi://Gio?version=2.0" + + import { exit, programArgs, programInvocationName } from "system" +imports.package._findEffectiveEntryPointName = () => 'io.github.flattool.Ignition'; imports.package.init({ - name: "@PACKAGE_NAME@", - version: "@PACKAGE_VERSION@", + name: "@PACKAGE_NAME@", + version: "@VERSION@", diff --git a/src/meson.build b/src/meson.build -index 488fa06..751f8ed 100644 +index dc242fb..7334af7 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -23,7 +23,6 @@ data_res = gnome.compile_resources('io.github.flattool.Ignition.data', +@@ -37,7 +37,6 @@ install_subdir( ) bin_conf = configuration_data() @@ -24,3 +26,4 @@ index 488fa06..751f8ed 100644 bin_conf.set('PACKAGE_VERSION', meson.project_version()) bin_conf.set('PACKAGE_NAME', meson.project_name()) bin_conf.set('prefix', get_option('prefix')) + diff --git a/pkgs/by-name/ig/ignition/package.nix b/pkgs/by-name/ig/ignition/package.nix index 539d463b7fae..edabfe8ebe4e 100644 --- a/pkgs/by-name/ig/ignition/package.nix +++ b/pkgs/by-name/ig/ignition/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ignition"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "flattool"; repo = "ignition"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-GDoF6NcFzMGzvYYoHwSctLlXCqsbfnUFdT9AIGcUkIQ="; + hash = "sha256-bkH8nxvqzxzYse7HNRWi79FfuMmLxd/CppKJQk2rTbo="; }; patches = [ @@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { libadwaita ]; + # Needed since Jasmine is not in nixpkgs + mesonFlags = [ "-Dtests=false" ]; + meta = { description = "Manage startup apps and scripts"; homepage = "https://github.com/flattool/ignition";