Skip to content

Commit

Permalink
floxify package build (#5)
Browse files Browse the repository at this point in the history
* de-flakify

* floxify

* flakebump

* fix: add version to package metadata and profile package names

* etc-profiles: updated description

* output refactoring

- include base in list of outputs
- split 0100_common-paths.sh into a separate output

* refactor: don't link base etc/profile from profile outputs

* rename ld-rheload -> ld-floxlib

Updated ld-rheload to fall back to $FLOX_LIB (instead of the RHEL
default /lib64) and renamed package accordingly.

* flakebump

* Update for Mac

The Darwin linker has the DYLD_FALLBACK_LIBRARY_PATH variable which
accomplishes more or less the same thing we do on Linux using LD_AUDIT
and ld-floxlib, by allowing us to append a "last chance" location for
finding shared libraries when all else fails.

* empty commit to bump version number

* Update trivial-test.yml (#6)

* Update compare-nix.yml (#7)

* Update compare-nix.yml

* Update compare-nix.yml

---------

Co-authored-by: Alex Ameen <[email protected]>
  • Loading branch information
limeytexan and aakropotkin authored Jun 28, 2023
1 parent ba7035b commit e47bc5c
Show file tree
Hide file tree
Showing 11 changed files with 1,403 additions and 152 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/compare-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ jobs:
nix profile install \
'nixpkgs#sqlite^bin,out,dev' \
'nixpkgs#pkg-config' \
"$selfURI#profile-base" \
"$selfURI#profile-common-paths" \
"$selfURI#etc-profiles" \
;
export FLOX_ENV="$HOME/.nix-profile";
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/trivial-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ jobs:
fi
echo "selfURI: $selfURI" >&2;
echo "Installing locally defined deps" >&2;
flox install -e sqlite-dev "$selfURI#profile-base";
flox install -e sqlite-dev "$selfURI#profile-common-paths";
flox install -e sqlite-dev "$selfURI#etc-profiles";
# Have to work around a bunch of unset variables that get us killed
# when `set -eu; set -o pipefail;' is active.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.flox
7 changes: 7 additions & 0 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@ Recommended usage:
- [[file:./profile.d/0500_node.sh][profile-node]] sets =NODE_PATH=.
+ Only runs if =node= is in =PATH=, so it is a sane member of a robust
=profile.d= collection.


* Environment Variables
- flox uses the ~LD_AUDIT~ environment variable as the mechanism
for loading shared libraries from the flox environment.
Define ~LD_FLOXLIB_AUDIT_IMPURE=1~ to view the substitutions
taking place.
Loading

0 comments on commit e47bc5c

Please sign in to comment.