the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

add build for ofborg-simple-build

Browse source
This commit is contained in:
Daiderd Jordan 2020-04-25 14:32:42 +02:00
parent 96639e9d7e
commit 40c759e027
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
default.nix
View file

@ -1,20 +1,13 @@
{ pkgs ? import ./nix { overlays = [ (import ./nix/overlay.nix) ]; } }: { pkgs ? import ./nix { overlays = [ (import ./nix/overlay.nix) ]; } }:
let let
ofborgOverrides = { ofborgCrates = pkgs.callPackage ./Cargo.nix {
crateOverrides = pkgs.defaultCrateOverrides // {
ofborg = attrs: {
buildInputs = pkgs.lib.optional pkgs.stdenv.isDarwin
pkgs.darwin.apple_sdk.frameworks.Security;
};
};
};
drv = ((pkgs.callPackage ./Cargo.nix {
cratesIO = pkgs.callPackage ./crates-io.nix {}; cratesIO = pkgs.callPackage ./crates-io.nix {};
}).ofborg {}).override { release = false; }; };
src = stripDeps (drv.override ofborgOverrides); drv = ofborgCrates.ofborg {};
src = stripDeps (drv.override { release = false; });
stripDeps = pkg: pkgs.runCommand "${pkg.name}-deps-stripped" {} stripDeps = pkg: pkgs.runCommand "${pkg.name}-deps-stripped" {}
'' ''
@ -27,6 +20,8 @@ let
in in
{ {
ofborg.simple-build = ofborgCrates.ofborg_simple_build {};
ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { inherit src; } '' ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { inherit src; } ''
mkdir -p $out/bin mkdir -p $out/bin
for f in $(find $src -type f); do for f in $(find $src -type f); do

11
nix/overlay.nix
View file

@ -1,5 +1,14 @@
(self: super: { (self: super:
{
defaultCrateOverrides = super.defaultCrateOverrides // { defaultCrateOverrides = super.defaultCrateOverrides // {
ofborg = attrs: {
buildInputs = with self.darwin.apple_sdk.frameworks;
super.lib.optional super.stdenv.isDarwin Security;
};
ofborg-simple-build = attrs: {
buildInputs = with self.darwin.apple_sdk.frameworks;
super.lib.optional super.stdenv.isDarwin Security;
};
openssl-sys = attrs: { openssl-sys = attrs: {
buildInputs = [ self.openssl_1_0_2 ]; buildInputs = [ self.openssl_1_0_2 ];
nativeBuildInputs = [ self.pkgconfig ]; nativeBuildInputs = [ self.pkgconfig ];