gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 5f6b37f57e 2fe1993baa
commit 5a2626087a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/terminal-emulators/termonad/default.nix
+6 -2
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";
};
}
pkgs/top-level/all-packages.nix
+3 -3
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 { };