fix(watchman)

pkgxdev · Dec 23, 2024 · 31c0a45 · 31c0a45
1 parent 73144fa
commit 31c0a45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/projects/facebook.com/edencommon/package.yml b/projects/facebook.com/edencommon/package.yml
@@ -13,14 +13,14 @@ dependencies:
   facebook.com/mvfst: '*' # since 2024.03.18.00
   openssl.org: ^1.1
   sourceware.org/bzip2: ^1
+  boost.org: ~1.87
   linux:
     gnu.org/gcc/libstdcxx: 13
 
 build:
   dependencies:
     cmake.org: '*'
     google.com/googletest: '*'
-    boost.org: ^1
     linux:
       gnu.org/gcc: 13
   script:

diff --git a/projects/facebook.com/watchman/package.yml b/projects/facebook.com/watchman/package.yml
@@ -6,7 +6,6 @@ versions:
   github: facebook/watchman
 
 dependencies:
-  boost.org: ^1.84
   # these need version locking, but we don't support that yet
   # facebook.com/edencommon: '{{version}}'
   # facebook.com/fb303: '{{version}}'
@@ -45,7 +44,7 @@ build:
         - mainfile=$(find . -name "main.cpp")
         - 'echo "Found main.cpp at: $mainfile"'
         - oldline='auto state_dir = computeWatchmanStateDirectory(user);'
-        - "newline='const char* env_state_dir = getenv(\"WATCHMAN_STATE_DIR\"); auto state_dir = env_state_dir ? env_state_dir : computeWatchmanStateDirectory(user);'"
+        - 'newline=''const char* env_state_dir = getenv("WATCHMAN_STATE_DIR"); auto state_dir = env_state_dir ? env_state_dir : computeWatchmanStateDirectory(user);'''
         - sed -i "s/$oldline/$newline/" "$mainfile"
         - cat $mainfile
       working-directory: watchman
@@ -119,7 +118,7 @@ build:
 
 runtime:
   env:
-    WATCHMAN_STATE_DIR: "{{prefix}}/var/run/watchman"
+    WATCHMAN_STATE_DIR: '{{prefix}}/var/run/watchman'
 
 provides:
   - bin/watchman