Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a57a726f895a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5604dbe8785c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on May 31, 2017

  1. google-app-engine-go-sdk: fix error on macOS

    @lufia
    lufia committed May 31, 2017
    Copy the full SHA
    0146f18 View commit details

  2. google-app-engine-go-sdk: remove platform assert

    @Mic92
    Mic92 committed May 31, 2017
    Copy the full SHA
    682b0ec View commit details

  3. Merge pull request #26276 from lufia/fix-appengine-go-darwin 

    google-app-engine-go-sdk: fix error on macOS
    @Mic92
    Mic92 authored May 31, 2017
    Copy the full SHA
    5604dbe View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/development/tools/google-app-engine-go-sdk/default.nix
14 changes: 7 additions & 7 deletions pkgs/development/tools/google-app-engine-go-sdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, python27, python27Packages }:
{ stdenv, fetchzip, python27, python27Packages, makeWrapper }:

assert stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
with python27Packages;

stdenv.mkDerivation rec {
name = "google-app-engine-go-sdk-${version}";
@@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
sha256 = "18hgl4wz3rhaklkwaxl8gm70h7l8k225f86da682kafawrr8zhv4";
};

buildInputs = with python27Packages; [
(python27.withPackages(ps: [ cffi cryptography pyopenssl ]))
];
buildInputs = [python27 makeWrapper];

installPhase = ''
mkdir -p $out/bin $out/share/
cp -r "$src" "$out/share/go_appengine"
# create wrappers with correct env
for i in goapp appcfg.py; do
ln -s "$out/share/go_appengine/$i" "$out/bin/$i"
makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \
--prefix PATH : "${python27}/bin" \
--prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})"
done
'';

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
version = version;
homepage = "https://cloud.google.com/appengine/docs/go/";
license = licenses.asl20;
platforms = with platforms; linux ++ darwin;
platforms = ["x86_64-linux" "x86_64-darwin"];
maintainers = with maintainers; [ lufia ];
};
}