mepo_1_1: remove package
i can just use normal `mepo` now.
This commit is contained in:
parent
75770cd34b
commit
2f53e94cc9
|
@ -844,24 +844,6 @@ in {
|
||||||
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
|
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
|
||||||
});
|
});
|
||||||
|
|
||||||
# mepo_1_1 = emulateBuildMachine (prev.mepo_1_1.override {
|
|
||||||
# zig_0_9 = final.zig_0_9.overrideAttrs (upstream: {
|
|
||||||
# cmakeFlags = (upstream.cmakeFlags or []) ++ [
|
|
||||||
# "-DZIG_EXECUTABLE=${final.buildPackages.zig_0_9}/bin/zig"
|
|
||||||
# ];
|
|
||||||
# doInstallCheck = false;
|
|
||||||
# });
|
|
||||||
# });
|
|
||||||
mepo_1_1 = emulateBuildMachine (prev.mepo_1_1.override {
|
|
||||||
zig_0_9 = emulateBuildMachine (final.zig_0_9.overrideAttrs (upstream: {
|
|
||||||
cmakeFlags = (upstream.cmakeFlags or []) ++ [
|
|
||||||
# "-DZIG_EXECUTABLE=${final.buildPackages.zig_0_9}/bin/zig"
|
|
||||||
"-DZIG_TARGET_TRIPLE=aarch64-linux-gnu"
|
|
||||||
];
|
|
||||||
doInstallCheck = false;
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
|
|
||||||
mepo = prev.mepo.overrideAttrs (upstream: {
|
mepo = prev.mepo.overrideAttrs (upstream: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
{ stdenv
|
|
||||||
, mepo
|
|
||||||
, fetchFromSourcehut
|
|
||||||
, zig_0_9
|
|
||||||
}:
|
|
||||||
(mepo.override {
|
|
||||||
inherit stdenv; #< for easier `override` in cross.nix
|
|
||||||
zig = zig_0_9;
|
|
||||||
}).overrideAttrs (orig: rec {
|
|
||||||
version = "1.1";
|
|
||||||
src = fetchFromSourcehut {
|
|
||||||
owner = "~mil";
|
|
||||||
repo = "mepo";
|
|
||||||
rev = version;
|
|
||||||
hash = "sha256-OIZ617QLjiTiDwcsn0DnRussYtjDkVyifr2mdSqA98A=";
|
|
||||||
};
|
|
||||||
})
|
|
|
@ -41,7 +41,6 @@ let
|
||||||
ldd-aarch64 = callPackage ./additional/ldd-aarch64 { };
|
ldd-aarch64 = callPackage ./additional/ldd-aarch64 { };
|
||||||
lightdm-mobile-greeter = callPackage ./additional/lightdm-mobile-greeter { };
|
lightdm-mobile-greeter = callPackage ./additional/lightdm-mobile-greeter { };
|
||||||
linux-megous = callPackage ./additional/linux-megous { };
|
linux-megous = callPackage ./additional/linux-megous { };
|
||||||
mepo_1_1 = callPackage ./additional/mepo_1_1 { };
|
|
||||||
mpv-uosc-latest = callPackage ./additional/mpv-uosc-latest { };
|
mpv-uosc-latest = callPackage ./additional/mpv-uosc-latest { };
|
||||||
mx-sanebot = callPackage ./additional/mx-sanebot { };
|
mx-sanebot = callPackage ./additional/mx-sanebot { };
|
||||||
rtl8723cs-firmware = callPackage ./additional/rtl8723cs-firmware { };
|
rtl8723cs-firmware = callPackage ./additional/rtl8723cs-firmware { };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user