diff --git a/data/hu.kramo.Cartridges.metainfo.xml.in b/data/hu.kramo.Cartridges.metainfo.xml.in index a0923eb..2af5bde 100644 --- a/data/hu.kramo.Cartridges.metainfo.xml.in +++ b/data/hu.kramo.Cartridges.metainfo.xml.in @@ -34,4 +34,5 @@ Preferences + diff --git a/hu.kramo.Cartridges.json b/hu.kramo.Cartridges.json index 90308bb..a79949d 100644 --- a/hu.kramo.Cartridges.json +++ b/hu.kramo.Cartridges.json @@ -1,5 +1,5 @@ { - "app-id" : "hu.kramo.Cartridges", + "id" : "hu.kramo.Cartridges", "runtime" : "org.gnome.Platform", "runtime-version" : "44", "sdk" : "org.gnome.Sdk", @@ -31,7 +31,20 @@ "*.a" ], "modules" : [ - "python3-modules.json", + { + "name": "python3-pyyaml", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyyaml\" --no-build-isolation" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz", + "sha256": "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2" + } + ] + }, { "name" : "blueprint-compiler", "buildsystem" : "meson", diff --git a/python3-modules.json b/python3-modules.json deleted file mode 100644 index bfa1a0a..0000000 --- a/python3-modules.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "python3-modules", - "buildsystem": "simple", - "build-commands": [], - "modules": [ - { - "name": "python3-pyyaml", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyyaml\" --no-build-isolation" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz", - "sha256": "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2" - } - ] - } - ] -} \ No newline at end of file