--- 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" } --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Jrsonnet"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/master"; fenix = { url = "github:CertainLach/fenix/fix/libatomic"; inputs.nixpkgs.follows = "nixpkgs"; @@ -240,6 +240,8 @@ jrsonnet-darwin = pkgs.callPackage ./nix/jrsonnet-cross-darwin.nix { craneLib = craneLibCross; targetTriple = "${targetArch}-apple-darwin"; + # https://github.com/rust-cross/cargo-zigbuild/issues/433 + zig = pkgs.zig_0_15; }; jrsonnet-experimental-darwin = jrsonnet-darwin.override { withExperimentalFeatures = true; --- 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 ''; }