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

Merge pull request #287 from LnL7/darwin-security

Browse source 
add back Security on darwin and cleanup expression
This commit is contained in:
Graham Christensen 2018-12-04 16:10:44 -05:00 committed by GitHub
parent f96d6ed492 f6a94756cb
commit 931f6ae003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
default.nix
View file

@ -1,6 +1,21 @@
{ pkgs ? import ./nix {}
}:
{ pkgs ? import ./nix {} }:
let
ofborgOverrides = {
crateOverrides = pkgs.defaultCrateOverrides // {
ofborg = attrs: {
buildInputs = pkgs.lib.optional pkgs.stdenv.isDarwin
pkgs.darwin.apple_sdk.frameworks.Security;
};
};
};
drv = (pkgs.callPackage ./ofborg/Cargo.nix {
cratesIO = pkgs.callPackage ./ofborg/crates-io.nix {};
}).ofborg {};
src = stripDeps (drv.override ofborgOverrides);
stripDeps = pkg: pkgs.runCommand "${pkg.name}-deps-stripped" {}
''
cp -r ${pkg} $out
@ -9,14 +24,10 @@ let
find $out/bin -name '*.d' -delete
chmod -R a-w $out
'';
in {
ofborg.rs = let
drv = (pkgs.callPackage ./ofborg/Cargo.nix {
cratesIO = pkgs.callPackage ./ofborg/crates-io.nix {};
}).ofborg {};
in pkgs.runCommand "ofborg-rs-symlink-compat" {
src = stripDeps drv;
} ''
in
{
ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { inherit src; } ''
mkdir -p $out/bin
for f in $(find $src -type f); do
bn=$(basename "$f")
@ -44,21 +55,21 @@ in {
Build failed because you bumped the Cargo
version without regenerating the carnix
file.
Build failed because you bumped the Cargo
version without regenerating the carnix
file.
Run:
Run:
nix-shell --run ./nix/update-carnix.sh
nix-shell --run ./nix/update-carnix.sh
and commit those changes.
and commit those changes.
EOF
EOF
fi
'';