Compare commits
2 Commits
ce4d10ad93
...
1b190f8a81
Author | SHA1 | Date | |
---|---|---|---|
1b190f8a81 | |||
f7f4206afa |
@ -0,0 +1,53 @@
|
|||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
|
||||||
|
, alacritty
|
||||||
|
|
||||||
|
, fontconfig
|
||||||
|
, freetype
|
||||||
|
, libglvnd
|
||||||
|
, libxcb
|
||||||
|
}:
|
||||||
|
|
||||||
|
alacritty.overrideAttrs (oldAttrs: rec {
|
||||||
|
pname = "${oldAttrs.pname}-ligatures";
|
||||||
|
version = "0.7.2.20210209.g3ed0430";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "zenixls2";
|
||||||
|
repo = "alacritty";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
rev = "3ed043046fc74f288d4c8fa7e4463dc201213500";
|
||||||
|
sha256 = "1dGk4ORzMSUQhuKSt5Yo7rOJCJ5/folwPX2tLiu0suA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
|
||||||
|
name = "${pname}-${version}-vendor.tar.gz";
|
||||||
|
inherit src;
|
||||||
|
outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
|
||||||
|
});
|
||||||
|
|
||||||
|
ligatureInputs = [
|
||||||
|
fontconfig
|
||||||
|
freetype
|
||||||
|
libglvnd
|
||||||
|
stdenv.cc.cc.lib
|
||||||
|
libxcb
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = (oldAttrs.buildInputs or [ ]) ++ ligatureInputs;
|
||||||
|
|
||||||
|
# HACK: One of the ligature libraries required the C++ stdlib at runtime,
|
||||||
|
# and I can't work out a better way to push it to the RPATH.
|
||||||
|
postInstall = lib.optional (!stdenv.isDarwin) ''
|
||||||
|
patchelf \
|
||||||
|
--set-rpath ${lib.makeLibraryPath ligatureInputs}:"$(patchelf --print-rpath $out/bin/alacritty)" \
|
||||||
|
$out/bin/alacritty
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = oldAttrs.meta // {
|
||||||
|
description = "Alacritty with ligature patch applied";
|
||||||
|
homepage = "https://github.com/zenixls2/alacritty/tree/ligature";
|
||||||
|
};
|
||||||
|
})
|
@ -68,5 +68,6 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "https://gitlab.com/cardboardwm/cardboard";
|
homepage = "https://gitlab.com/cardboardwm/cardboard";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = wlroots.meta.platforms;
|
platforms = wlroots.meta.platforms;
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,49 +2,7 @@
|
|||||||
|
|
||||||
rec {
|
rec {
|
||||||
# Alacritty with the unmerged ligature patches applied.
|
# Alacritty with the unmerged ligature patches applied.
|
||||||
alacritty-ligatures = pkgs.alacritty.overrideAttrs (oldAttrs: rec {
|
alacritty-ligatures = pkgs.callPackage ../applications/terminal-emulators/alacritty-ligatures { };
|
||||||
pname = "${oldAttrs.pname}-ligatures";
|
|
||||||
version = "0.7.2.20210209.g3ed0430";
|
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "zenixls2";
|
|
||||||
repo = "alacritty";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
rev = "3ed043046fc74f288d4c8fa7e4463dc201213500";
|
|
||||||
sha256 = "1dGk4ORzMSUQhuKSt5Yo7rOJCJ5/folwPX2tLiu0suA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
|
|
||||||
name = "${pname}-${version}-vendor.tar.gz";
|
|
||||||
inherit src;
|
|
||||||
outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
|
|
||||||
});
|
|
||||||
|
|
||||||
ligatureInputs = [
|
|
||||||
pkgs.fontconfig
|
|
||||||
pkgs.freetype
|
|
||||||
pkgs.libglvnd
|
|
||||||
pkgs.stdenv.cc.cc.lib
|
|
||||||
pkgs.xlibs.libxcb
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = (oldAttrs.buildInputs or []) ++ ligatureInputs;
|
|
||||||
|
|
||||||
outputs = [ "out" ];
|
|
||||||
|
|
||||||
# HACK: One of the ligature libraries required the C++ stdlib at runtime,
|
|
||||||
# and I can't work out a better way to push it to the RPATH.
|
|
||||||
postInstall = pkgs.lib.optional (!pkgs.stdenv.isDarwin) ''
|
|
||||||
patchelf \
|
|
||||||
--set-rpath ${pkgs.lib.makeLibraryPath ligatureInputs}:"$(patchelf --print-rpath $out/bin/alacritty)" \
|
|
||||||
$out/bin/alacritty
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = oldAttrs.meta // {
|
|
||||||
description = "Alacritty with ligature patch applied";
|
|
||||||
homepage = "https://github.com/zenixls2/alacritty/tree/ligature";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
amdgpu-fan = pkgs.callPackage ../tools/misc/amdgpu-fan { };
|
amdgpu-fan = pkgs.callPackage ../tools/misc/amdgpu-fan { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user