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

Commits on Mar 2, 2019

  1. cairo: use buildInputs for libraries

    @matthewbauer
    matthewbauer committed Mar 2, 2019
    Copy the full SHA
    1d4efdc View commit details

  2. Merge pull request #56660 from matthewbauer/cairo-fix-deps 

    cairo: use buildInputs for libraries
    @matthewbauer
    matthewbauer authored Mar 2, 2019

    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
    1487031 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/development/libraries/cairo/default.nix
3 changes: 3 additions & 0 deletions pkgs/development/libraries/cairo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,9 @@ in stdenv.mkDerivation rec {

nativeBuildInputs = [
pkgconfig
];

buildInputs = [
libiconv
libintl
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [