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: 7700101dfc69
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 300b60dae709
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 5, 2020

  1. tiny: fix build on darwin

    @chuwy
    chuwy committed Jul 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    davidtwco David Wood
    GPG key ID: 2592E76C87381FD9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bb9cd25 View commit details

  2. Merge pull request #92365 from chuwy/tiny-darwin 

    tiny: fix build on darwin
    @marsam
    marsam authored Jul 5, 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
    300b60d View commit details
Showing with 5 additions and 2 deletions.
  1. +2 −1 pkgs/applications/networking/irc/tiny/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
3 changes: 2 additions & 1 deletion pkgs/applications/networking/irc/tiny/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, pkg-config
, dbus
, openssl
, Foundation
}:

rustPlatform.buildRustPackage rec {
@@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;

nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ];
buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation;

meta = with lib; {
description = "A console IRC client";
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22601,7 +22601,9 @@ in

tint2 = callPackage ../applications/misc/tint2 { };

tiny = callPackage ../applications/networking/irc/tiny { };
tiny = callPackage ../applications/networking/irc/tiny {
inherit (darwin.apple_sdk.frameworks) Foundation;
};

tipp10 = qt5.callPackage ../applications/misc/tipp10 { };