diff --git a/flake.lock b/flake.lock index 611fb9ef..ad67c407 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1621158380, - "narHash": "sha256-r8pc3IFkEQ9MZDdSnR4+VUEnpjPsJYUzp+jJ5WZx9Qc=", + "lastModified": 1621479520, + "narHash": "sha256-Rg3zltlqLYiK5r2To1nQQew1+pg5CmFm3b6iiF00miU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cf0d6b88cb65565d732db0db12038dc1db47b859", + "rev": "17492ddf37e8104da2b8d4b44e689b42a0a9476c", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1621135068, - "narHash": "sha256-aPJlgosfLp3QtPDFLf/N7qNpIo5Q45MpYyzlaACL2G4=", + "lastModified": 1621417094, + "narHash": "sha256-Csk4p8jFUma7FtMnjEJGTPGxCOnTbb30xr8AXwrUTMM=", "owner": "nix-community", "repo": "home-manager", - "rev": "77188bcd6e2c6c7a99253b36f08ed7b65f2901d2", + "rev": "3d18912f5ae7c98bd5249411d98cdf3b28fe1f09", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1621165930, - "narHash": "sha256-llqY1DscZwHEhHoruxbCYKU2NNsfP0/hoTSxXmCmgew=", + "lastModified": 1621470282, + "narHash": "sha256-oZmUb1snJn0E2SCK2lpsTfdmQ59DKoR+6RBLH9qwNQ4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b92a817238eae3e2f3dfbc8d205a5a1c0d1461c", + "rev": "62b840ba3fb462c159bc4226bec4288e1064a853", "type": "github" }, "original": { diff --git a/modules/emacs.nix b/modules/emacs.nix index 99f2da6e..ffa9cc60 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -3,7 +3,7 @@ let emacsPkg = pkgs.emacsWithPackagesFromUsePackage { config = ./emacs/init.el; - package = pkgs.emacsPgtk; + package = pkgs.emacsPgtkGcc; alwaysEnsure = true; extraEmacsPackages = epkgs: [ # mu4e is included in the mu package and should be used from there diff --git a/patches/123757.patch b/patches/123757.patch new file mode 100644 index 00000000..b51dbaba --- /dev/null +++ b/patches/123757.patch @@ -0,0 +1,32 @@ +From 3bd0e3b5189ae5d8ed31f14e231c09b38b5f558e Mon Sep 17 00:00:00 2001 +From: Pierre Bourdon +Date: Thu, 20 May 2021 04:13:35 +0200 +Subject: [PATCH] libvdpau-va-gl: drop obsolete ffmpeg_3 dependency + +I couldn't find any reference as to why this dependency would be +required for 0.4.2. Digging into the changelog, it looks like 0.4.0 +dropped the libswscale dependency, so this seems like it's now unneeded. +--- + pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix +index 85ebef12fe1fda..7a042a172c821a 100644 +--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix ++++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix +@@ -1,5 +1,5 @@ + { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp +-, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: ++, libXext, libvdpau, glib, libva, libGLU }: + + stdenv.mkDerivation rec { + pname = "libvdpau-va-gl"; +@@ -13,7 +13,7 @@ stdenv.mkDerivation rec { + }; + + nativeBuildInputs = [ cmake pkg-config ]; +- buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; ++ buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva libGLU ]; + + doCheck = false; # fails. needs DRI access +