cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fix references to pkgs/lib

Browse source
This commit is contained in:
Eelco Dolstra 2013-09-30 22:43:34 +02:00
parent 5fef92c4a0
commit 3293421dd3
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/eval-release.nix
View file

@ -1,7 +1,7 @@
# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate # Evaluate `release.nix' like Hydra would. Too bad nix-instantiate
# can't to do this. # can't to do this.
with import ../../pkgs/lib; with import ../../lib;
let let
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);

5
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -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 , browserName, desktopName, nameSuffix, icon
}: }:
@ -50,8 +50,7 @@ stdenv.mkDerivation {
description = description =
browser.meta.description browser.meta.description
+ " (with plugins: " + " (with plugins: "
+ (let lib = import ../../../../lib; + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
in lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)))
+ ")"; + ")";
}; };
} }

2
pkgs/stdenv/generic/default.nix
View file

@ -14,7 +14,7 @@ else
let let
lib = import ../../lib; lib = import ../../../lib;
allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";

6
pkgs/top-level/all-packages.nix
View file

@ -46,7 +46,7 @@ let config_ = config; platform_ = platform; in # rename the function arguments
let let
lib = import ../lib; lib = import ../../lib;
# The contents of the configuration file found at $NIXPKGS_CONFIG or # The contents of the configuration file found at $NIXPKGS_CONFIG or
# $HOME/.nixpkgs/config.nix. # $HOME/.nixpkgs/config.nix.
@ -381,7 +381,7 @@ let
inherit pkgs; inherit pkgs;
}; };
composableDerivation = (import ../lib/composable-derivation.nix) { composableDerivation = (import ../../lib/composable-derivation.nix) {
inherit pkgs lib; inherit pkgs lib;
}; };
@ -8886,7 +8886,7 @@ let
enableGnash = cfg.enableGnash or false; enableGnash = cfg.enableGnash or false;
in in
import ../applications/networking/browsers/firefox/wrapper.nix { 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 = plugins =
assert !(enableGnash && enableAdobeFlash); assert !(enableGnash && enableAdobeFlash);
([ ] ([ ]