diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-25 00:37:54 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-25 00:40:40 +0200 |
commit | e4610f2965c2ab60132344defa055792a658ea45 (patch) | |
tree | e496de33c039df3ff9c63a31e73774e182050fb8 /pkgs/os-specific | |
parent | 9c61317002edf32812d793aebac86a990edcd1cb (diff) | |
download | nixlib-e4610f2965c2ab60132344defa055792a658ea45.tar nixlib-e4610f2965c2ab60132344defa055792a658ea45.tar.gz nixlib-e4610f2965c2ab60132344defa055792a658ea45.tar.bz2 nixlib-e4610f2965c2ab60132344defa055792a658ea45.tar.lz nixlib-e4610f2965c2ab60132344defa055792a658ea45.tar.xz nixlib-e4610f2965c2ab60132344defa055792a658ea45.tar.zst nixlib-e4610f2965c2ab60132344defa055792a658ea45.zip |
buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 259c5acdf873..a995b193a845 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; + priority = 6; # give precedence to kernel firmware }; passthru = { inherit version; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ab564c10e2e5..cbd9a19777e5 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation { license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; + priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 7f2aeca255c8..7768875ca57f 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { homepage = http://www.kernel.org/pub/linux/utils/util-linux/; description = "A set of system utilities for Linux"; platforms = stdenv.lib.platforms.linux; + priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages }; } |