at 18.03-beta 51 lines 2.7 kB view raw
1diff --git a/makefile b/makefile 2index b6865f3..c14f5ec 100644 3--- a/makefile 4+++ b/makefile 5@@ -53,8 +53,8 @@ $(SRCDIR)/include/trousers/scoped_tss_type.h: extrasrc/scoped_tss_type.h | $(SRC 6 cp $< $@ 7 # Chromium includes <leveldb/memenv.h>. This requires an install of libleveldb-dev that has 8 # memenv support included; move this into a local leveldb/ subdirectory 9-$(SRCDIR)/include/leveldb/memenv.h: /usr/include/leveldb/helpers/memenv.h | $(SRCDIR)/include/leveldb 10- cp $< $@ 11+$(SRCDIR)/include/leveldb/memenv.h: $(SRCDIR)/include/leveldb 12+ cp @@NIXOS_LEVELDB@@/include/leveldb/helpers/memenv.h $@ 13 # Chromium includes <include/testing/gtest/include/gtest/gtest_prod.h>, so have a local copy. 14 $(SRCDIR)/include/testing/gtest/include/gtest/gtest_prod.h: extrasrc/gtest_prod.h | $(SRCDIR)/include/testing/gtest/include/gtest 15 cp $< $@ 16@@ -80,7 +80,7 @@ GMOCK_DIR=$(SRCDIR)/gmock-$(GMOCK_VERSION) 17 GTEST_DIR=$(GMOCK_DIR)/gtest 18 src_gmock: $(GMOCK_DIR)/LICENSE 19 $(GMOCK_DIR)/LICENSE: | $(SRCDIR) 20- cd $(SRCDIR) && wget $(GMOCK_URL) 21+ cd $(SRCDIR) && cp @@NIXOS_SRC_GMOCK@@ gmock-$(GMOCK_VERSION).zip && chmod +w gmock-$(GMOCK_VERSION).zip 22 cd $(SRCDIR) && unzip -q gmock-$(GMOCK_VERSION).zip 23 rm $(SRCDIR)/gmock-$(GMOCK_VERSION).zip 24 touch $@ 25@@ -107,8 +107,7 @@ src_chromebase: $(SRCDIR)/base/base64.h 26 $(SRCDIR)/base: | $(SRCDIR) 27 mkdir -p $@ 28 $(SRCDIR)/base/base64.h: | $(SRCDIR)/base 29- git clone $(CHROMEBASE_GIT) $(SRCDIR)/base 30- cd $(SRCDIR)/base && git checkout $(CHROMEBASE_COMMIT) 31+ cp -r @@NIXOS_SRC_CHROMEBASE@@/. $(SRCDIR)/base && chmod -R +w $(SRCDIR)/base 32 33 # We need two subdirectories from the platform2 repository from ChromiumOS: 34 # - chaps/ for the Chaps source code 35@@ -119,14 +118,8 @@ $(SRCDIR)/platform2: 36 PLATFORM2_GIT=https://chromium.googlesource.com/chromiumos/platform2 37 PATCHES=$(wildcard $(CURDIR)/patches/platform2/*.patch) 38 $(SRCDIR)/platform2/chaps/Makefile: | $(SRCDIR)/platform2 39- cd $(SRCDIR)/platform2 && git init . && git remote add -f origin $(PLATFORM2_GIT) 40- cd $(SRCDIR)/platform2 && git config core.sparsecheckout true 41- cd $(SRCDIR)/platform2 && echo "chaps" > .git/info/sparse-checkout 42- cd $(SRCDIR)/platform2 && echo "libchromeos/chromeos" >> .git/info/sparse-checkout 43- cd $(SRCDIR)/platform2 && echo "common-mk/common.mk" >> .git/info/sparse-checkout 44- cd $(SRCDIR)/platform2 && git pull origin master 45- cd $(SRCDIR)/platform2 && git checkout $(CROS_BRANCH) 46- cd $(SRCDIR)/platform2 && if [ ! -z "$(PATCHES)" ]; then git am $(PATCHES); fi 47+ cd $(SRCDIR)/platform2 && cp -r @@NIXOS_SRC_PLATFORM2@@/. . && chmod -R +w $(SRCDIR)/platform2 48+ cd $(SRCDIR)/platform2 && if [ ! -z "$(PATCHES)" ]; then patch -p1 < $(PATCHES); fi 49 50 51 # Copy man pages