fastfetch: 2.32.1 -> 2.33.0; disable flashfetch binary by default (#368254)
This commit is contained in:
@@ -41,16 +41,17 @@
|
|||||||
vulkanSupport ? true,
|
vulkanSupport ? true,
|
||||||
waylandSupport ? true,
|
waylandSupport ? true,
|
||||||
x11Support ? true,
|
x11Support ? true,
|
||||||
|
flashfetchSupport ? false,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "fastfetch";
|
pname = "fastfetch";
|
||||||
version = "2.32.1";
|
version = "2.33.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fastfetch-cli";
|
owner = "fastfetch-cli";
|
||||||
repo = "fastfetch";
|
repo = "fastfetch";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-EfnHndj7WPXkL7wxGzeigJ7iE2WdgUf74sPDQhob+Ho=";
|
hash = "sha256-GCUG9b98UmuC/6psDs4PNAoquEWOMz0kl/IBQXRGX5o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
@@ -123,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
(lib.cmakeBool "ENABLE_XCB_RANDR" x11Support)
|
(lib.cmakeBool "ENABLE_XCB_RANDR" x11Support)
|
||||||
(lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin)))
|
(lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin)))
|
||||||
(lib.cmakeBool "ENABLE_XRANDR" x11Support)
|
(lib.cmakeBool "ENABLE_XRANDR" x11Support)
|
||||||
|
(lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport)
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
(lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids")
|
(lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids")
|
||||||
@@ -133,9 +135,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}'
|
substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall =
|
||||||
|
''
|
||||||
wrapProgram $out/bin/fastfetch \
|
wrapProgram $out/bin/fastfetch \
|
||||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
|
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
|
||||||
|
''
|
||||||
|
+ lib.optionalString flashfetchSupport ''
|
||||||
wrapProgram $out/bin/flashfetch \
|
wrapProgram $out/bin/flashfetch \
|
||||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
|
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
|
||||||
'';
|
'';
|
||||||
|
|||||||
Reference in New Issue
Block a user