diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-28 18:52:32 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:04:43 +0200 |
| commit | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (patch) | |
| tree | c87f3f5b1dd0d4589ee6af05de162f1baa7a1c6e | |
| parent | 99e68e7c83e6601abf1861f9a6426eb79f7cf554 (diff) | |
| download | nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.tar nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.tar.gz nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.tar.bz2 nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.tar.lz nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.tar.xz nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.tar.zst nixlib-c02f0ade90c2ba28063dc21a8cbdad50b777f403.zip | |
fix evaluation on darwin, fixing tarball job fully
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/llvm.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index adf65f7c9393..7471974d00a1 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index 38b85a098c17..8b10136309cd 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -10,6 +10,8 @@ , libpciaccess }: +assert stdenv.isLinux; + stdenv.mkDerivation { name = "xf86-input-multitouch-20110312"; |