Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2f13349bf78
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96adf59a8fca
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 30, 2019

  1. mkDerivation: fix $srcs handling

    @globin
    globin committed Oct 30, 2019
    Copy the full SHA
    96adf59 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/stdenv/generic/setup.sh
6 changes: 3 additions & 3 deletions pkgs/stdenv/generic/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -854,13 +854,13 @@ unpackFile() {
unpackPhase() {
runHook preUnpack

if [ -z "${srcs:-}" ]; then
if [ -z ${srcs+"${srcs[@]}"} ]; then
if [ -z "${src:-}" ]; then
# shellcheck disable=SC2016
echo 'variable $src or $srcs should point to the source'
exit 1
fi
srcs="$src"
srcs=("$src")
fi

# To determine the source directory created by unpacking the
@@ -875,7 +875,7 @@ unpackPhase() {
done

# Unpack all source archives.
for i in $srcs; do
for i in "${srcs[@]}"; do
unpackFile "$i"
done