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

Merge commit 'b97242238d7efb029c76eb8d4fe4b1228a5b49a8'

Browse Source 
Both parent commits were previously tied as the most recent ancestor to
'master' and 'release-18.09'.
This commit is contained in:
John Ericson 2018-09-23 10:59:27 -04:00
commit 45f40f5fe0
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/fetchzip/default.nix
View File

@ -14,7 +14,7 @@
, name ? "source" , name ? "source"
, ... } @ args: , ... } @ args:
lib.overrideDerivation (fetchurl ({ (fetchurl ({
inherit name; inherit name;
recursiveHash = true; recursiveHash = true;
@ -23,8 +23,6 @@ lib.overrideDerivation (fetchurl ({
postFetch = postFetch =
'' ''
export PATH=${unzip}/bin:$PATH
unpackDir="$TMPDIR/unpack" unpackDir="$TMPDIR/unpack"
mkdir "$unpackDir" mkdir "$unpackDir"
cd "$unpackDir" cd "$unpackDir"
@ -48,6 +46,7 @@ lib.overrideDerivation (fetchurl ({
mv "$unpackDir" "$out" mv "$unpackDir" "$out"
'') #*/ '') #*/
+ extraPostFetch; + extraPostFetch;
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])) } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too # Hackety-hack: we actually need unzip hooks, too
(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
})

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -126,9 +126,9 @@ self: super: builtins.intersectAttrs super {
# the system-fileio tests use canonicalizePath, which fails in the sandbox # the system-fileio tests use canonicalizePath, which fails in the sandbox
system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
# Prevents needing to add security_tool as a build tool to all of x509-system's # Prevents needing to add `security_tool` as a run-time dependency for
# dependencies. # everything using x509-system to give access to the `security` executable.
x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool; then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
postPatch = (drv.postPatch or "") + '' postPatch = (drv.postPatch or "") + ''

1
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -120,6 +120,7 @@ let
"--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
"--with-gcc=${stdenv.cc.targetPrefix}cc" "--with-gcc=${stdenv.cc.targetPrefix}cc"
"--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
"--with-ar=${stdenv.cc.bintools.targetPrefix}ar"
# use the one that comes with the cross compiler. # use the one that comes with the cross compiler.
"--with-hsc2hs=${ghc.targetPrefix}hsc2hs" "--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
"--with-strip=${stdenv.cc.bintools.targetPrefix}strip" "--with-strip=${stdenv.cc.bintools.targetPrefix}strip"

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

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.libusb.info; homepage = http://www.libusb.info;
description = "User-space USB library"; description = "User-space USB library";
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.all;
maintainers = [ ]; maintainers = [ ];
}; };
} }

10
pkgs/development/libraries/zlib/default.nix
View File

@ -3,7 +3,7 @@
, static ? false , static ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "zlib-${version}"; name = "zlib-${version}";
version = "1.2.11"; version = "1.2.11";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# what causes this difference. # what causes this difference.
+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
for file in $out/lib/*.so* $out/lib/*.dylib* ; do for file in $out/lib/*.so* $out/lib/*.dylib* ; do
install_name_tool -id "$file" $file ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file
done done
'' ''
# Non-typical naming confuses libtool which then refuses to use zlib's DLL # Non-typical naming confuses libtool which then refuses to use zlib's DLL
@ -78,4 +78,8 @@ stdenv.mkDerivation rec {
license = licenses.zlib; license = licenses.zlib;
platforms = platforms.all; platforms = platforms.all;
}; };
} } // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
preConfigure = ''
export CHOST=${stdenv.hostPlatform.config}
'';
})