difftreelog
ci package everything for darwin cross
in: master
3 files changed
flake.lockdiffbeforeafterboth--- a/flake.lock
+++ b/flake.lock
@@ -110,15 +110,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1778022901,
+ "lastModified": 1778255217,
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5d0f6be1c3cebacc3e817a18a44a3ac89ff66109",
+ "rev": "aa279bba121eac3e966b6dcea9891b5e96330944",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "release-25.11",
+ "ref": "master",
"repo": "nixpkgs",
"type": "github"
}
flake.nixdiffbeforeafterboth1{1{2 description = "Jrsonnet";2 description = "Jrsonnet";3 inputs = {3 inputs = {4 nixpkgs.url = "github:nixos/nixpkgs/release-25.11";4 nixpkgs.url = "github:nixos/nixpkgs/master";5 fenix = {5 fenix = {6 url = "github:CertainLach/fenix/fix/libatomic";6 url = "github:CertainLach/fenix/fix/libatomic";7 inputs.nixpkgs.follows = "nixpkgs";7 inputs.nixpkgs.follows = "nixpkgs";240 jrsonnet-darwin = pkgs.callPackage ./nix/jrsonnet-cross-darwin.nix {240 jrsonnet-darwin = pkgs.callPackage ./nix/jrsonnet-cross-darwin.nix {241 craneLib = craneLibCross;241 craneLib = craneLibCross;242 targetTriple = "${targetArch}-apple-darwin";242 targetTriple = "${targetArch}-apple-darwin";243 # https://github.com/rust-cross/cargo-zigbuild/issues/433244 zig = pkgs.zig_0_15;243 };245 };244 jrsonnet-experimental-darwin = jrsonnet-darwin.override {246 jrsonnet-experimental-darwin = jrsonnet-darwin.override {245 withExperimentalFeatures = true;247 withExperimentalFeatures = true;nix/jrsonnet-cross-darwin.nixdiffbeforeafterboth--- a/nix/jrsonnet-cross-darwin.nix
+++ b/nix/jrsonnet-cross-darwin.nix
@@ -43,7 +43,11 @@
doNotPostBuildInstallCargoBinaries = true;
installPhaseCommand = ''
- mkdir -p $out/bin
+ mkdir -p $out/bin $out/lib
cp target/${targetTriple}/release/jrsonnet $out/bin/jrsonnet
+ cp target/${targetTriple}/release/jrsonnet-fmt $out/bin/jrsonnet-fmt
+ cp target/${targetTriple}/release/jrb $out/bin/jrb
+ cp target/${targetTriple}/release/libjsonnet.dylib $out/lib/libjsonnet.dylib
+ cp target/${targetTriple}/release/libjsonnet.a $out/lib/libjsonnet.a
'';
}