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

Commits on Mar 24, 2018

  1. libcdio-paranoia: fix darwin build 

    (cherry picked from commit 285ef9b)
    @knedlsepp @Mic92
    knedlsepp authored and Mic92 committed Mar 24, 2018
    Copy the full SHA
    a978eee View commit details
Showing with 13 additions and 3 deletions.
  1. +10 −2 pkgs/development/libraries/libcdio-paranoia/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
12 changes: 10 additions & 2 deletions pkgs/development/libraries/libcdio-paranoia/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }:
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
libiconv, IOKit, DiskArbitration}:

stdenv.mkDerivation {
name = "libcdio-paranoia-0.94+2";
@@ -11,7 +12,14 @@ stdenv.mkDerivation {
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libcdio ];
buildInputs = [ libcdio ] ++
stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];

propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;

configureFlags = stdenv.lib.optionals stdenv.isDarwin [
"--disable-ld-version-script"
];

meta = with stdenv.lib; {
description = "CD paranoia on top of libcdio";
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9563,7 +9563,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};

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

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