diff options
author | (cdep)illabout <cdep.illabout@gmail.com> | 2021-09-01 14:03:51 +0900 |
---|---|---|
committer | (cdep)illabout <cdep.illabout@gmail.com> | 2021-09-01 14:03:51 +0900 |
commit | 2fe1993baa0c6f8bb6aa7189fc431b24c66397ac (patch) | |
tree | 046cff3a6044e4fad347f7b7ed9bfb859d885101 /pkgs | |
parent | 5f6b37f57e87b36dd9f0003f253111622b361c9c (diff) |
termonad: add meta.mainProgram to easily run with flakes
This also adds a top-level `termonad` alias for `termonad-with-packages`.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/terminal-emulators/termonad/default.nix | 8 | ||||
-rw-r--r-- | 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 4388cbcfb4419..6a1dd0bec3987 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 2066fe4a72370..ae5d655841d22 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 { }; |