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

Commits on Nov 11, 2020

  1. wrangler: fix Darwin build

    @happysalada
    happysalada committed Nov 11, 2020

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: E315A75846131564
    Learn about vigilant mode
    Copy the full SHA
    4c875b9 View commit details

  2. Merge pull request #103418 from happysalada/wrangler_fix_darwin_build 

    wrangler: fix Darwin build
    @Br1ght0ne
    Br1ght0ne authored Nov 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    89ff657 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/tools/wrangler/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/tools/wrangler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx";

nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config perl ];
nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];

buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [