JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34176 from dtzWill/fix/cross-misc-3

Browse Source 
Misc cross fixes
This commit is contained in:
John Ericson 2018-01-22 19:47:52 -05:00 committed by GitHub
commit a959e60f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/science/logic/lean/default.nix
View File

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9"; sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9";
}; };
buildInputs = [ gmp cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ gmp ];
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' preConfigure = ''

2
pkgs/development/libraries/libedit/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff"; # NROFF = "${groff}/bin/nroff";
patches = [ ./01-cygwin.patch ]; patches = [ ./01-cygwin.patch ];

3
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@ -46,7 +46,8 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
''; '';
buildInputs = [ python makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ python ];
installPhase = '' installPhase = ''

3
pkgs/development/python-modules/setuptools/default.nix
View File

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75"; sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75";
}; };
buildInputs = [ python wrapPython unzip ]; nativeBuildInputs = [ unzip wrapPython ];
buildInputs = [ python ];
doCheck = false; # requires pytest doCheck = false; # requires pytest
installPhase = '' installPhase = ''
dst=$out/${python.sitePackages} dst=$out/${python.sitePackages}

3
pkgs/os-specific/linux/audit/default.nix
View File

@ -1,5 +1,5 @@
{ {
stdenv, fetchurl, stdenv, buildPackages, fetchurl,
enablePython ? false, python ? null, enablePython ? false, python ? null,
}: }:
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = stdenv.lib.optional enablePython python; buildInputs = stdenv.lib.optional enablePython python;
configureFlags = [ configureFlags = [

3
pkgs/servers/dns/bind/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
buildInputs = [ openssl libtool perl libxml2 ] ++ nativeBuildInputs = [ perl ];
buildInputs = [ openssl libtool libxml2 ] ++
stdenv.lib.optional enableSeccomp libseccomp; stdenv.lib.optional enableSeccomp libseccomp;
STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase

5
pkgs/tools/archivers/unrar/default.nix
View File

@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
}; };
postPatch = '' postPatch = ''
sed 's/^CXX=g++/#CXX/' -i makefile substituteInPlace makefile \
--replace "CXX=" "#CXX=" \
--replace "STRIP=" "#STRIP=" \
--replace "AR=" "#AR="
''; '';
buildPhase = '' buildPhase = ''