diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-03-21 20:24:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 20:24:59 -0400 |
| commit | 16a0c383241136c4de8fd97276c85dd1e2269bde (patch) | |
| tree | cc29233f92ecfcaf2dd391dab493080fc30a0367 | |
| parent | 2793a6c3bb3fe55a49ceedb513100f00bf719b7c (diff) | |
| parent | 2676d48ff8e7cd908d02a3b6668d8914c1d2b238 (diff) | |
| download | nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.tar nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.tar.gz nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.tar.bz2 nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.tar.lz nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.tar.xz nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.tar.zst nixpkgs-16a0c383241136c4de8fd97276c85dd1e2269bde.zip | |
Merge pull request #24185 from LnL7/atomicparsley-clang
atomicparsley: fix build with llvm 4
| -rw-r--r-- | pkgs/tools/video/atomicparsley/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 835cacf0098..b2eb5366618 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, fetchurl, unzip, darwin }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; @@ -10,10 +10,13 @@ stdenv.mkDerivation rec { sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; }; - buildInputs = with pkgs; [ unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - patches = [ ./casts.patch ]; + patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch; + + buildInputs = [ unzip ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + setSourceRoot = "sourceRoot=${product}-source-${version}"; + buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; |