Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14041,6 +14041,12 @@
github = "RossComputerGuy";
githubId = 19699320;
};
rotaerk = {
name = "Matthew Stewart";
email = "m.scott.stewart@gmail.com";
github = "rotaerk";
githubId = 17690823;
};
rowanG077 = {
email = "goemansrowan@gmail.com";
github = "rowanG077";
Expand Down
44 changes: 39 additions & 5 deletions pkgs/applications/editors/pixelorama/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates, nix-update-script }:
{ lib
, stdenv
, alsa-lib
, autoPatchelfHook
, fetchFromGitHub
, godot3-headless
, godot3-export-templates
, libGLU
, libpulseaudio
, libX11
, libXcursor
, libXi
, libXinerama
, libXrandr
, libXrender
, nix-update-script
, udev
}:

let
preset =
Expand All @@ -19,18 +36,29 @@ in stdenv.mkDerivation (finalAttrs: {
};

nativeBuildInputs = [
godot-headless
autoPatchelfHook
godot3-headless
];

buildInputs = [
libGLU
libX11
libXcursor
libXi
libXinerama
libXrandr
libXrender
];

buildPhase = ''
runHook preBuild

export HOME=$(mktemp -d)
mkdir -p $HOME/.local/share/godot/
ln -s "${godot-export-templates}/share/godot/templates" "$HOME/.local/share/godot/templates"
ln -s "${godot3-export-templates}/share/godot/templates" "$HOME/.local/share/godot/templates"
mkdir -p build
godot-headless -v --export "${preset}" ./build/pixelorama
godot-headless -v --export-pack "${preset}" ./build/pixelorama.pck
godot3-headless -v --export "${preset}" ./build/pixelorama
godot3-headless -v --export-pack "${preset}" ./build/pixelorama.pck

runHook postBuild
'';
Expand All @@ -47,6 +75,12 @@ in stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';

runtimeDependencies = map lib.getLib [
alsa-lib
libpulseaudio
udev
];

passthru.updateScript = nix-update-script { };

meta = with lib; {
Expand Down
19 changes: 14 additions & 5 deletions pkgs/applications/graphics/lorien/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
, stdenv
, fetchFromGitHub

, autoPatchelfHook
, copyDesktopItems
, makeDesktopItem

, godot-export-templates
, godot-headless
, godot3-export-templates
, godot3-headless

, alsa-lib
, libGL
, libGLU
, libpulseaudio
, libX11
, libXcursor
, libXext
Expand Down Expand Up @@ -41,8 +43,9 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
godot-headless
godot3-headless
];

buildInputs = [
Expand Down Expand Up @@ -83,11 +86,11 @@ stdenv.mkDerivation rec {
# Link the export-templates to the expected location. The --export commands
# expects the template-file at .../templates/{godot-version}.stable/linux_x11_64_release
mkdir -p $HOME/.local/share/godot
ln -s ${godot-export-templates}/share/godot/templates $HOME/.local/share/godot
ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot

mkdir -p $out/share/lorien

godot-headless --path lorien --export "${preset}" $out/share/lorien/lorien
godot3-headless --path lorien --export "${preset}" $out/share/lorien/lorien

runHook postBuild
'';
Expand All @@ -110,6 +113,12 @@ stdenv.mkDerivation rec {
runHook postInstall
'';

runtimeDependencies = map lib.getLib [
alsa-lib
libpulseaudio
udev
];

meta = with lib; {
homepage = "https://github.com/mbrlabs/Lorien";
description = "An infinite canvas drawing/note-taking app";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/tools/gdtoolkit/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, python3Packages
, fetchFromGitHub
, godot-server
, godot3-server
}:

let lark080 = python3Packages.lark.overrideAttrs (old: rec {
Expand Down Expand Up @@ -43,12 +43,12 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = with python3Packages; [
pytestCheckHook
hypothesis
godot-server
godot3-server
];

preCheck =
let
godotServerMajorVersion = lib.versions.major godot-server.version;
godotServerMajorVersion = lib.versions.major godot3-server.version;
gdtoolkitMajorVersion = lib.versions.major version;
msg = ''
gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}!
Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/tools/godot/3/debug-server.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ godot3-headless }:

godot3-headless.overrideAttrs (self: base: {
pname = "godot3-debug-server";
godotBuildDescription = "debug server";
shouldBuildTools = false;
})
Loading