From bcf391a94d04e4aa51533f769b97b8d5be00e853 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Dec 2014 18:24:39 +0100 Subject: [PATCH] Disambiguate util-linux package names --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fac760a480..354a1bf5df6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8758,15 +8758,15 @@ let usermount = callPackage ../os-specific/linux/usermount { }; - utillinux = lowPrio (callPackage ../os-specific/linux/util-linux { + utillinux = callPackage ../os-specific/linux/util-linux { ncurses = null; perl = null; - }); - - utillinuxCurses = utillinux.override { - inherit ncurses perl; }; + utillinuxCurses = appendToName "curses" (utillinux.override { + inherit ncurses perl; + }); + v4l_utils = callPackage ../os-specific/linux/v4l-utils { withQt4 = true; };