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: b30dbbc57701
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfb1db7a7518
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 7, 2018

  1. cacert: use addEnvHooks

    LnL7 committed Jan 7, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    406e162 View commit details
  2. tzdata: use addEnvHooks

    LnL7 committed Jan 7, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    6c39c9c View commit details
  3. dleyna-core: use addEnvHooks

    LnL7 committed Jan 7, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    d01cb0c View commit details
  4. gnuradio: use addEnvHooks

    LnL7 committed Jan 7, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    bfb1db7 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/misc/gnuradio/default.nix
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
addGRCBlocksPath() {
addToSearchPath GRC_BLOCKS_PATH $1/share/gnuradio/grc/blocks
}
envHooks+=(addGRCBlocksPath)
addEnvHooks "$targetOffset" addGRCBlocksPath
'';

setupHook = [ grcSetupHook ];
3 changes: 1 addition & 2 deletions pkgs/data/misc/cacert/setup-hook.sh
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@ cacertHook() {
export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
}

envHooks+=(cacertHook)
crossEnvHooks+=(cacertHook)
addEnvHooks "$targetOffset" cacertHook
3 changes: 1 addition & 2 deletions pkgs/data/misc/tzdata/tzdata-setup-hook.sh
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@ tzdataHook() {
export TZDIR=@out@/share/zoneinfo
}

envHooks+=(tzdataHook)
crossEnvHooks+=(tzdataHook)
addEnvHooks "$targetOffset" tzdataHook
3 changes: 1 addition & 2 deletions pkgs/development/libraries/dleyna-core/setup-hook.sh
Original file line number Diff line number Diff line change
@@ -5,5 +5,4 @@ addDleynaConnectorPath () {
fi
}

envHooks+=(addDleynaConnectorPath)

addEnvHooks "$targetOffset" addDleynaConnectorPath