cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #136350 from cdepillabout/termonad-fixup

Browse source 
termonad: add meta.mainProgram to easily run with flakes
This commit is contained in:
Dennis Gosnell 2021-09-01 21:20:57 +09:00 committed by GitHub
commit 5a2626087a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/terminal-emulators/termonad/default.nix
View file

@ -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";
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -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 { };