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: 38178a9a5bf9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e994b67a7f81
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2019

  1. plasma5: Fix setup hook some more 

    1. `[[...]]` is more robust wrt empty expansions than `[..]`

2. `${foo-}` is simpler and won't accidentally be a url compared to
`${foo:-}`

3. `+=` works even when the variable is undefined.
    @Ericson2314
    Ericson2314 committed Nov 24, 2019
    Copy the full SHA
    b45938a View commit details

  2. Merge pull request #74080 from Ericson2314/fix-kde 

    plasma5: Fix setup hook some more
    @worldofpeace
    worldofpeace authored Nov 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    targos Michaël Zasso
    GPG key ID: 770F7A9A5AE15600
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e994b67 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/desktops/plasma-5/default.nix
6 changes: 3 additions & 3 deletions pkgs/desktops/plasma-5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,11 +43,11 @@ let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
if [ "''${hookName:-}" != postHook ]; then
if [[ "''${hookName-}" != postHook ]]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $${out} output
propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
propagatedUserEnvPkgs+=" @${out}@"
if [ -z "$outputDev" ]; then
echo "error: \$outputDev is unset!" >&2
@@ -57,7 +57,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
propagatedBuildInputs="$propagatedBuildInputs @dev@"
propagatedBuildInputs+=" @dev@"
fi
fi
'';