MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix fallout from merge of master

Browse source
This commit is contained in:
Eric Seidel 2015-04-06 19:48:44 -07:00
parent 6ec373d776
commit c94b24fa4a
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -1,10 +1,13 @@
{ stdenv, fetchurl
, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
, useNcurses ? false, ncurses, useQt4 ? false, qt4
, wantPS ? false, ps ? null
}:
with stdenv.lib;
assert wantPS -> (ps != null);
let
os = stdenv.lib.optionalString;
majorVersion = "3.2";
@ -41,6 +44,8 @@ stdenv.mkDerivation rec {
++ optional useNcurses ncurses
++ optional useQt4 qt4;
propagatedBuildInputs = optional wantPS ps;
CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
configureFlags =

4
pkgs/development/tools/misc/fswatch/default.nix
View file

@ -3,7 +3,7 @@
, autoconf
, automake
, findutils # for xargs
, gettext_0_19
, gettext
, libtool
, makeWrapper
, texinfo
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
};
buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ];
buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ];
preConfigure = ''
./autogen.sh

11
pkgs/top-level/all-packages.nix
View file

@ -4972,12 +4972,6 @@ let
ps = if stdenv.isDarwin then darwin.ps else null;
};
cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix {
jsoncpp = jsoncpp-1_6;
};
cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { };
cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
cmakeCurses = cmake.override { useNcurses = true; };
cmakeWithGui = cmakeCurses.override { useQt4 = true; };
@ -5772,7 +5766,6 @@ let
gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
gettext_0_18 = callPackage ../development/libraries/gettext { };
gettext_0_19 = callPackage ../development/libraries/gettext/0.19.nix { };
gd = callPackage ../development/libraries/gd { };
@ -6143,7 +6136,6 @@ let
json_c = callPackage ../development/libraries/json-c { };
jsoncpp = callPackage ../development/libraries/jsoncpp { };
jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
libjson = callPackage ../development/libraries/libjson { };
@ -6973,7 +6965,8 @@ let
# makes it slower, but during runtime we link against just mesa_drivers
# through /run/opengl-driver*, which is overriden according to config.grsecurity
grsecEnabled = true;
llvm = llvm_35;
libva = libva.override { mesa = null; };
llvmPackages = llvmPackages_36;
});
mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
mesa_drivers = mesaDarwinOr (