From a9afe0c06589bc7fce94be52dfda5b4338d5b7ea Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:33:44 +0200 Subject: [PATCH 1/2] houdini: move meta to package definition --- pkgs/applications/misc/houdini/default.nix | 10 ++++++++++ pkgs/applications/misc/houdini/runtime-build.nix | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 64536177aaff..802d4fe3e675 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -100,4 +100,14 @@ buildFHSEnv rec { export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH exec "$@" ''; + + meta = { + description = "3D animation application software"; + homepage = "https://www.sidefx.com"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "houdini"; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; + }; } diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix index 60f27c194964..27e6f098574e 100644 --- a/pkgs/applications/misc/houdini/runtime-build.nix +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -23,13 +23,4 @@ stdenv.mkDerivation rec { ''; dontFixup = true; - - meta = with lib; { - description = "3D animation application software"; - homepage = "https://www.sidefx.com"; - license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with maintainers; [ canndrew kwohlfahrt ]; - }; } From 39103842ab619989116e07564f71dce7e7cc32b1 Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:20:48 +0200 Subject: [PATCH 2/2] maintainers: add pedohorse --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/misc/houdini/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 01211d6d7be8..1478567e99ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15500,6 +15500,11 @@ githubId = 943430; name = "David Hagege"; }; + pedohorse = { + github = "pedohorse"; + githubId = 13556996; + name = "pedohorse"; + }; pedrohlc = { email = "root@pedrohlc.com"; github = "PedroHLC"; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 802d4fe3e675..4a0a24239a0b 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -108,6 +108,6 @@ buildFHSEnv rec { platforms = [ "x86_64-linux" ]; mainProgram = "houdini"; hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; + maintainers = with lib.maintainers; [ canndrew kwohlfahrt pedohorse ]; }; }