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

Commits on Oct 28, 2019

  1. symlinkJoin: fix cross

    @alyssais
    alyssais committed Oct 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59dbb00 View commit details

  2. Merge pull request #72173 from alyssais/symlinkJoin-cross 

    symlinkJoin: fix cross
    @Ericson2314
    Ericson2314 authored Oct 28, 2019
    Copy the full SHA
    1503091 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/top-level/stage.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/stage.nix
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ let

trivialBuilders = self: super:
import ../build-support/trivial-builders.nix {
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.pkgsBuildHost.xorg) lndir;
inherit (self) runtimeShell;
};