From c02f0ade90c2ba28063dc21a8cbdad50b777f403 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 28 Apr 2016 18:52:32 +0200 Subject: fix evaluation on darwin, fixing tarball job fully --- pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +- pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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"; -- cgit 1.4.1