diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-14 01:06:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 01:06:41 +0200 |
| commit | e55eec5208d2d84363f6602bdf72de7703505c5e (patch) | |
| tree | 10a527fce45c15f0cd8744c557b338c228b3970f | |
| parent | 78b4d9ac807bd75b2ee9d616045b8006afec5b93 (diff) | |
| parent | 85c43675d0908ec289fa808047e29356449bd674 (diff) | |
| download | nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.tar nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.tar.gz nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.tar.bz2 nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.tar.lz nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.tar.xz nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.tar.zst nixpkgs-e55eec5208d2d84363f6602bdf72de7703505c5e.zip | |
Merge pull request #44912 from thefloweringash/dcraw-darwin
dcraw: fix build on Darwin
| -rw-r--r-- | pkgs/tools/graphics/dcraw/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index dd81c3e4ecc..e4ceff36f92 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -8,15 +8,18 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext jasper ]; patchPhase = '' - sed -i -e s@/usr/local@$out@ install + substituteInPlace install \ + --replace 'prefix=/usr/local' 'prefix=$out' \ + --replace gcc '$CC' ''; buildPhase = '' mkdir -p $out/bin - sh install + sh -e install ''; meta = { |