byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-07-30 18:34:00 +05:30
Code Issues Projects Releases Packages Wiki Activity

Updated system

Browse source
This commit is contained in:
Emmet 2024-09-07 14:02:36 -05:00
parent 03844a1d63
commit de4875268a
4 changed files with 79 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

60
patches/emacs-no-version-check.patch
View file

@ -1,37 +1,23 @@
diff -crB nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix
*** nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 20:42:24.476059868 -0500
--- nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 21:12:46.637645595 -0500
***************
*** 3,9 ****
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
{ pname
! , version
, buildInputs ? []
, packageRequires ? []
, meta ? {}
--- 3,9 ----
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
{ pname
! , version ? null
, buildInputs ? []
, packageRequires ? []
, meta ? {}
***************
*** 20,26 ****
in
stdenv.mkDerivation (finalAttrs: ({
! name = "emacs-${pname}-${finalAttrs.version}";
unpackCmd = ''
case "$curSrc" in
--- 20,26 ----
in
stdenv.mkDerivation (finalAttrs: ({
! name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}";
unpackCmd = ''
case "$curSrc" in
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 3ff10ee86..56d03b6e6 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -25,7 +25,8 @@ in
libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
-{ buildInputs ? []
+{ version ? null
+, buildInputs ? []
, nativeBuildInputs ? []
, packageRequires ? []
, propagatedBuildInputs ? []
@@ -38,7 +39,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
}@args:
{
- name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}";
+ name = args.name or "emacs-${finalAttrs.pname}${lib.optionalString (version != null) "-${version}"}";
unpackCmd = args.unpackCmd or ''
case "$curSrc" in