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: 4ba61cd136f5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af041b34a29d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 12, 2018

  1. libcdio: fix darwin build 

    /cc ZHF #36454
    @LnL7
    LnL7 committed Mar 12, 2018
    Copy the full SHA
    af041b3 View commit details
Showing with 7 additions and 4 deletions.
  1. +2 −2 pkgs/development/libraries/libcdio/default.nix
  2. +5 −2 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libcdio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }:
{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }:

stdenv.mkDerivation rec {
name = "libcdio-2.0.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libcddb ncurses help2man ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];

# Disabled due to several spurious test failures.
# doCheck = true;
7 changes: 5 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2290,7 +2290,7 @@ with pkgs;
flameGraph = flamegraph;

flvtool2 = callPackage ../tools/video/flvtool2 { };

fmbt = callPackage ../development/tools/fmbt {
python = python2;
};
@@ -9555,7 +9555,10 @@ with pkgs;

libcddb = callPackage ../development/libraries/libcddb { };

libcdio = callPackage ../development/libraries/libcdio { };
libcdio = callPackage ../development/libraries/libcdio {
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};

libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { };

libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };