diff --git a/pkgs/lib/meta.nix b/pkgs/lib/meta.nix index 56463361928..0c5841dd717 100644 --- a/pkgs/lib/meta.nix +++ b/pkgs/lib/meta.nix @@ -40,5 +40,9 @@ rec { */ lowPrio = drv: addMetaAttrs { priority = "10"; } drv; + /* Increase the nix-env priority of the package, i.e., this + version/variant of the package will be preferred. + */ + hiPrio = drv: addMetaAttrs { priority = "110"; } drv; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fd8dbe145a..32b266c79f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -139,7 +139,7 @@ let inherit lib config getConfig stdenvAdapters; - inherit (lib) lowPrio appendToName makeOverridable; + inherit (lib) lowPrio hiPrio appendToName makeOverridable; # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. @@ -7838,9 +7838,11 @@ let inherit fetchurl stdenv; }; - org = import ../applications/editors/emacs-modes/org { + # This is usually a newer version of Org-Mode than that found in GNU Emacs, so + # we want it to have higher precedence. + org = hiPrio (import ../applications/editors/emacs-modes/org { inherit fetchurl stdenv emacs texinfo; - }; + }); prologMode = import ../applications/editors/emacs-modes/prolog { inherit fetchurl stdenv;