From 3293421dd3434cd84d660f3c4c3c81baf88bbd3d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Sep 2013 22:43:34 +0200 Subject: [PATCH] Fix references to pkgs/lib --- maintainers/scripts/eval-release.nix | 2 +- pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 ++--- pkgs/stdenv/generic/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index eccd77009a1..bb9572cbc79 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -1,7 +1,7 @@ # Evaluate `release.nix' like Hydra would. Too bad nix-instantiate # can't to do this. -with import ../../pkgs/lib; +with import ../../lib; let trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f8d2c2d0e8c..bf4c7f3e7d2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules +{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules , browserName, desktopName, nameSuffix, icon }: @@ -50,8 +50,7 @@ stdenv.mkDerivation { description = browser.meta.description + " (with plugins: " - + (let lib = import ../../../../lib; - in lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))) + + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)) + ")"; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 9b8fd5615e7..0b1003a7392 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -14,7 +14,7 @@ else let - lib = import ../../lib; + lib = import ../../../lib; allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 394ef116928..219add96e10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -46,7 +46,7 @@ let config_ = config; platform_ = platform; in # rename the function arguments let - lib = import ../lib; + lib = import ../../lib; # The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.nixpkgs/config.nix. @@ -381,7 +381,7 @@ let inherit pkgs; }; - composableDerivation = (import ../lib/composable-derivation.nix) { + composableDerivation = (import ../../lib/composable-derivation.nix) { inherit pkgs lib; }; @@ -8886,7 +8886,7 @@ let enableGnash = cfg.enableGnash or false; in import ../applications/networking/browsers/firefox/wrapper.nix { - inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; + inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = assert !(enableGnash && enableAdobeFlash); ([ ]