Skip to content

Commit

Permalink
Minor fixes in Nix
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Pombeiro committed Jun 12, 2019
1 parent 8a1ef0d commit d1d7af7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 41 deletions.
4 changes: 2 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:paths ["components/src" "src" "react-native/src/cljsjs" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.9.0"} ;; Keep in sync with version from Nix
org.clojure/clojurescript {:mvn/version "1.10.238"}
:deps {org.clojure/clojure {:mvn/version "1.10.0"} ;; Keep in sync with version from Nix
org.clojure/clojurescript {:mvn/version "1.10.520"}
org.clojure/core.async {:mvn/version "0.4.474"}
reagent {:mvn/version "0.7.0"
:exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]}
Expand Down
4 changes: 3 additions & 1 deletion derivation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ let
# TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib)
stdenv' = pkgs.stdenvNoCC;
gradle = pkgs.gradle_4_10;
go = pkgs.go_1_11;
buildGoPackage = pkgs.buildGoPackage.override { inherit go; };
statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go pkgs; inherit (pkgs) darwin; stdenv = stdenv'; nodejs = nodejs'; };
statusMobile = pkgs.callPackage ./nix/mobile { inherit target-os config pkgs status-go gradle; inherit (pkgs.xcodeenv) composeXcodeWrapper; stdenv = stdenv'; nodejs = nodejs'; };
status-go = pkgs.callPackage ./nix/status-go { inherit target-os; inherit (pkgs.xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
status-go = pkgs.callPackage ./nix/status-go { inherit target-os go buildGoPackage; inherit (pkgs.xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
nodejs' = pkgs.nodejs-10_x;
yarn' = pkgs.yarn.override { nodejs = nodejs'; };
nodePkgBuildInputs = [
Expand Down
2 changes: 1 addition & 1 deletion nix/status-go/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ with stdenv;
let
platform = callPackage ../platform.nix { inherit target-os; };
utils = callPackage ../utils.nix { inherit xcodeWrapper; };
gomobile = callPackage ./gomobile { inherit (androidPkgs) platform-tools; inherit composeXcodeWrapper xcodewrapperArgs utils; };
gomobile = callPackage ./gomobile { inherit (androidPkgs) platform-tools; inherit buildGoPackage composeXcodeWrapper xcodewrapperArgs utils; };
buildStatusGoDesktopLib = callPackage ./build-desktop-status-go.nix { inherit buildGoPackage go xcodeWrapper utils; };
buildStatusGoMobileLib = callPackage ./build-mobile-status-go.nix { inherit buildGoPackage go gomobile xcodeWrapper utils; };
extractStatusGoConfig = f: lib.last (lib.splitString "\n" (lib.fileContents f));
Expand Down
36 changes: 0 additions & 36 deletions scripts/build-android.sh

This file was deleted.

6 changes: 5 additions & 1 deletion scripts/start-react-native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ if [ ! -z "$METRO_PID" ]; then
[[ $term == 'y' ]] && kill $METRO_PID
fi

react-native start --config packager/config.js
if [ $TARGET_OS == 'ios' ] || [ $TARGET_OS == 'android' ]; then
react-native start --config packager/config.js
else
react-native start
fi

0 comments on commit d1d7af7

Please sign in to comment.