Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 919c37786ca8
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 987d4b9cb440
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 7, 2019

  1. make-closure needs build system mkdir and jq

    Make make-closure work when cross-compiling
    
    (cherry picked from commit f9f6ddc)
    telent authored and matthewbauer committed Feb 7, 2019
    Copy the full SHA
    987d4b9 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/build-support/closure-info.nix
4 changes: 2 additions & 2 deletions pkgs/build-support/closure-info.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
# "nix-store --load-db" and "nix-store --register-validity
# --hash-given".

{ stdenv, coreutils, jq }:
{ stdenv, coreutils, jq, buildPackages }:

{ rootPaths }:

@@ -17,7 +17,7 @@ stdenv.mkDerivation {

exportReferencesGraph.closure = rootPaths;

PATH = "${coreutils}/bin:${jq}/bin";
PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin";

builder = builtins.toFile "builder"
''