public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv.lib -> lib

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-27 10:25:35 +01:00
parent 3a0db27b90
commit 2ee8b30b64
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/trivial-builders.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lndir }: { lib, stdenv, lndir }:
rec { rec {
@ -55,9 +55,9 @@ rec {
('' (''
mkdir -p $out/nix-support mkdir -p $out/nix-support
cp ${script} $out/nix-support/setup-hook cp ${script} $out/nix-support/setup-hook
'' + stdenv.lib.optionalString (deps != []) '' '' + lib.optionalString (deps != []) ''
echo ${toString deps} > $out/nix-support/propagated-native-build-inputs echo ${toString deps} > $out/nix-support/propagated-native-build-inputs
'' + stdenv.lib.optionalString (substitutions != {}) '' '' + lib.optionalString (substitutions != {}) ''
substituteAll ${script} $out/nix-support/setup-hook substituteAll ${script} $out/nix-support/setup-hook
''); '');
@ -80,7 +80,7 @@ rec {
# Quickly create a set of symlinks to derivations. # Quickly create a set of symlinks to derivations.
# entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; }
linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" +
(stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
# Require file # Require file
requireFile = {name, sha256, url ? null, message ? null} : requireFile = {name, sha256, url ? null, message ? null} :

2
pkgs/top-level/all-packages.nix
View File

@ -85,7 +85,7 @@ let
# Helper functions that are exported through `pkgs'. # Helper functions that are exported through `pkgs'.
helperFunctions = helperFunctions =
stdenvAdapters // stdenvAdapters //
(import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
stdenvAdapters = stdenvAdapters =
import ../stdenv/adapters.nix pkgs; import ../stdenv/adapters.nix pkgs;