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

direnv: make cross-compile on windows

Browse Source
This commit is contained in:
Jörg Thalheim 2018-11-22 21:25:05 +00:00
parent 6f2475f5bf
commit 3681fa5456
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
description = "MIT Kerberos 5"; description = "MIT Kerberos 5";
homepage = http://web.mit.edu/kerberos/; homepage = http://web.mit.edu/kerberos/;
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington ];
}; };

2
pkgs/tools/misc/coreutils/default.nix
View File

@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.unix; platforms = platforms.unix ++ platforms.windows;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
}; };

9
pkgs/tools/misc/direnv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoPackage, bash}: { stdenv, fetchFromGitHub, buildGoPackage, bash, fetchpatch }:
buildGoPackage rec { buildGoPackage rec {
name = "direnv-${version}"; name = "direnv-${version}";
@ -16,9 +16,10 @@ buildGoPackage rec {
cd $NIX_BUILD_TOP/go/src/$goPackagePath cd $NIX_BUILD_TOP/go/src/$goPackagePath
''; '';
buildPhase = '' # we have no bash at the moment for windows
make BASH_PATH=${bash}/bin/bash makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [
''; "BASH_PATH=${bash}/bin/bash"
];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

2
pkgs/tools/networking/openssh/default.nix
View File

@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
homepage = http://www.openssh.com/; homepage = http://www.openssh.com/;
description = "An implementation of the SSH protocol"; description = "An implementation of the SSH protocol";
license = stdenv.lib.licenses.bsd2; license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ eelco aneeshusa ]; maintainers = with maintainers; [ eelco aneeshusa ];
}; };
} }

2
pkgs/tools/text/gawk/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.unix; platforms = platforms.unix ++ platforms.windows;
maintainers = [ ]; maintainers = [ ];
}; };

2
pkgs/top-level/perl-packages.nix
View File

@ -8934,7 +8934,7 @@ let
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The World-Wide Web library for Perl"; description = "The World-Wide Web library for Perl";
license = with licenses; [ artistic1 gpl1Plus ]; license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.unix; platforms = platforms.unix ++ platforms.windows;
}; };
buildInputs = [ TestFatal TestNeeds TestRequiresInternet ]; buildInputs = [ TestFatal TestNeeds TestRequiresInternet ];
}; };