diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-03 13:05:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-06 12:16:28 +0000 |
| commit | a550e8239c4fe79530036e207095f5de6403c699 (patch) | |
| tree | ca5f7d0332dda00c103b713ba577a0ae5f0722b5 /overlays/patches | |
| parent | 016ab41242b6d8ffb4421c99fd6517bebc668de4 (diff) | |
| download | nixlib-a550e8239c4fe79530036e207095f5de6403c699.tar nixlib-a550e8239c4fe79530036e207095f5de6403c699.tar.gz nixlib-a550e8239c4fe79530036e207095f5de6403c699.tar.bz2 nixlib-a550e8239c4fe79530036e207095f5de6403c699.tar.lz nixlib-a550e8239c4fe79530036e207095f5de6403c699.tar.xz nixlib-a550e8239c4fe79530036e207095f5de6403c699.tar.zst nixlib-a550e8239c4fe79530036e207095f5de6403c699.zip | |
overlays/patches: switch to emacs-overlay for pgtk
nixpkgs-wayland has removed Emacs in later versions in favour of emacs-overlay.
Diffstat (limited to 'overlays/patches')
| -rw-r--r-- | overlays/patches/default.nix | 6 | ||||
| -rw-r--r-- | overlays/patches/emacs/default.nix | 21 |
2 files changed, 3 insertions, 24 deletions
diff --git a/overlays/patches/default.nix b/overlays/patches/default.nix index 23a2b465bc34..a49db0c90871 100644 --- a/overlays/patches/default.nix +++ b/overlays/patches/default.nix @@ -3,9 +3,9 @@ self: super: { dino = self.callPackage ./dino { inherit (super) dino; }; - emacs-pgtk = self.callPackage ./emacs { - emacs = self.waylandPkgs.emacs-pgtk; - }; + emacs-overlay = self.extend (import ./emacs/overlay); + + inherit (self.emacs-overlay) emacsPgtk; emacsPackagesFor = emacs: self.callPackage ./emacs/packages.nix { emacsPackages = super.emacsPackagesFor emacs; diff --git a/overlays/patches/emacs/default.nix b/overlays/patches/emacs/default.nix deleted file mode 100644 index a2bfc4bdd298..000000000000 --- a/overlays/patches/emacs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ emacs, fetchpatch, ... } @ args: - -let - inherit (builtins) removeAttrs; -in - -(emacs.override (removeAttrs args [ "emacs" "fetchpatch" ])).overrideAttrs ( - { patches ? [], ... }: - { - patches = patches ++ [ - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=cbfce827ace4c410a2eed50c8d8c763721925b7e"; - sha256 = "0gy5vzcrrz7bba2y6xg6v67z625v6zbsia3i3ki0nk2ksayn9h9c"; - }) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=13651833c73b78e509a47ab38b8c5a60134f04fc"; - sha256 = "0plk9d8n0gsi8rpqn01qkkchwzcrig2cbr1ki9zpj140r7rywa6x"; - }) - ]; - } -) |