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

Commits on Apr 29, 2018

  1. nix: fix stdenv.system check -- should be hostPlatform 

    (stdenv.system is the system running the build, apparently)
    @dtzWill
    dtzWill committed Apr 29, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    tilpner Till Höppner
    GPG key ID: 6A13327225BE51F6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6e8118b View commit details

Commits on May 1, 2018

  1. Merge pull request #39666 from dtzWill/fix/stdenv-system-nix 

    nix: fix stdenv.system check -- should be hostPlatform
    @dtzWill
    dtzWill authored May 1, 2018
    Copy the full SHA
    47b2513 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/tools/package-management/nix/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ let
propagatedBuildInputs = [ boehmgc ];

# Seems to be required when using std::atomic with 64-bit types
NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic";
NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic";

configureFlags =
[ "--with-store-dir=${storeDir}"