From 2fe1993baa0c6f8bb6aa7189fc431b24c66397ac Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 1 Sep 2021 14:03:51 +0900 Subject: [PATCH] termonad: add meta.mainProgram to easily run with flakes This also adds a top-level `termonad` alias for `termonad-with-packages`. --- pkgs/applications/terminal-emulators/termonad/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix index 4388cbcfb441..6a1dd0bec398 100644 --- a/pkgs/applications/terminal-emulators/termonad/default.nix +++ b/pkgs/applications/terminal-emulators/termonad/default.nix @@ -1,7 +1,7 @@ -{ stdenv, ghcWithPackages, makeWrapper, packages ? (pkgSet: []) }: +{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []) }: let - termonadEnv = ghcWithPackages (self: [ self.termonad ] ++ packages self); + termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self); in stdenv.mkDerivation { name = "termonad-with-packages-${termonadEnv.version}"; @@ -16,4 +16,8 @@ in stdenv.mkDerivation { # trivial derivation preferLocalBuild = true; allowSubstitutes = false; + + meta = haskellPackages.termonad.meta // { + mainProgram = "termonad"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2066fe4a7237..ae5d655841d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1025,9 +1025,9 @@ with pkgs; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { - inherit (haskellPackages) ghcWithPackages; - }; + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { }; + + termonad = termonad-with-packages; termsyn = callPackage ../data/fonts/termsyn { };