Skip to content

direnv: make cross-compile on windows #50928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 1 commit into from
Nov 25, 2018
Merged

direnv: make cross-compile on windows #50928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kerberos/krb5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
description = "MIT Kerberos 5";
homepage = http://web.mit.edu/kerberos/;
license = licenses.mit;
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ wkennington ];
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/misc/coreutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ stdenv.mkDerivation rec {

license = licenses.gpl3Plus;

platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;

maintainers = [ maintainers.eelco ];
};
Expand Down
9 changes: 5 additions & 4 deletions pkgs/tools/misc/direnv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoPackage, bash}:
{ stdenv, fetchFromGitHub, buildGoPackage, bash, fetchpatch }:

buildGoPackage rec {
name = "direnv-${version}";
Expand All @@ -16,9 +16,10 @@ buildGoPackage rec {
cd $NIX_BUILD_TOP/go/src/$goPackagePath
'';

buildPhase = ''
make BASH_PATH=${bash}/bin/bash
'';
# we have no bash at the moment for windows
makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [
"BASH_PATH=${bash}/bin/bash"
];

installPhase = ''
mkdir -p $out
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/networking/openssh/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
homepage = http://www.openssh.com/;
description = "An implementation of the SSH protocol";
license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ eelco aneeshusa ];
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/text/gawk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ stdenv.mkDerivation rec {

license = licenses.gpl3Plus;

platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;

maintainers = [ ];
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/perl-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8934,7 +8934,7 @@ let
meta = with stdenv.lib; {
description = "The World-Wide Web library for Perl";
license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
};
buildInputs = [ TestFatal TestNeeds TestRequiresInternet ];
};
Expand Down