forked from lix-project/lix
package.nix: migrate the rest
Change-Id: Ic1e1de95be6e6d959b48d7810cb351232fc29033
This commit is contained in:
parent
435979de02
commit
b73cce7cc0
2 changed files with 13 additions and 9 deletions
14
flake.nix
14
flake.nix
|
@ -375,7 +375,7 @@
|
||||||
name = "nix-${version}";
|
name = "nix-${version}";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
inherit (comDeps.calledPackage)
|
inherit (comDeps.calledPackage.finalAttrs)
|
||||||
src
|
src
|
||||||
VERSION_SUFFIX
|
VERSION_SUFFIX
|
||||||
outputs
|
outputs
|
||||||
|
@ -393,20 +393,16 @@
|
||||||
doInstallCheck
|
doInstallCheck
|
||||||
installCheckFlags
|
installCheckFlags
|
||||||
installCheckTarget
|
installCheckTarget
|
||||||
|
separateDebugInfo
|
||||||
|
strictDeps
|
||||||
|
hardeningDisable
|
||||||
|
meta
|
||||||
;
|
;
|
||||||
|
|
||||||
separateDebugInfo = !currentStdenv.hostPlatform.isStatic;
|
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
|
|
||||||
|
|
||||||
passthru.perl-bindings = final.callPackage ./perl {
|
passthru.perl-bindings = final.callPackage ./perl {
|
||||||
inherit fileset;
|
inherit fileset;
|
||||||
stdenv = currentStdenv;
|
stdenv = currentStdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
meta.platforms = lib.platforms.unix;
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -219,6 +219,14 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||||
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
|
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
separateDebugInfo = !stdenv.hostPlatform.isStatic;
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
|
||||||
|
|
||||||
|
meta.platforms = lib.platforms.unix;
|
||||||
|
|
||||||
# FIXME: Used to make checkInputs accessible from outside the derivation args
|
# FIXME: Used to make checkInputs accessible from outside the derivation args
|
||||||
# during the refactor.
|
# during the refactor.
|
||||||
passthru.finalAttrs = finalAttrs;
|
passthru.finalAttrs = finalAttrs;
|
||||||
|
|
Loading…
Reference in a new issue