save works
This commit is contained in:
parent
f4b1ba4cd7
commit
acfbec875b
51 changed files with 622 additions and 1175 deletions
|
|
@ -4,18 +4,18 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
xce = pkgs.callPackage ./xce.nix {
|
||||
xcecore = pkgs.callPackage ./xce.nix {
|
||||
inherit pkgs myCommitId;
|
||||
withDebug = false;
|
||||
withAsan = false;
|
||||
};
|
||||
xce_debug = pkgs.callPackage ./xce.nix {
|
||||
xcecore_debug = pkgs.callPackage ./xce.nix {
|
||||
inherit pkgs myCommitId;
|
||||
withDebug = true;
|
||||
withAsan = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
xce = xce;
|
||||
xce_debug = xce_debug;
|
||||
xcecore = xcecore;
|
||||
xcecore_debug = xcecore_debug;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
pname = "xce";
|
||||
pname = "xcecore";
|
||||
version = "0.0.1";
|
||||
|
||||
src = ./..;
|
||||
|
|
@ -56,13 +56,8 @@ stdenv.mkDerivation {
|
|||
(extralib.overrideAttrs (oldAttrs: {
|
||||
separateDebugInfo = true;
|
||||
}))
|
||||
(librtti.overrideAttrs (oldAttrs: {
|
||||
separateDebugInfo = true;
|
||||
}))
|
||||
packcc
|
||||
cowsay
|
||||
fortune
|
||||
];
|
||||
] ++ (if withDebug then [librtti_debug] else [librtti]);
|
||||
|
||||
build-system = [ pkgs.meson ];
|
||||
|
||||
|
|
@ -77,8 +72,4 @@ stdenv.mkDerivation {
|
|||
("-Dcommit_id=" + myCommitId)
|
||||
# (lib.optional (!with_debug) "-Dbuildtype=release")
|
||||
];
|
||||
|
||||
meta = {
|
||||
mainProgram = "xcerun";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue