colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

mepo_1_1: remove package

Browse Source 
i can just use normal `mepo` now.
This commit is contained in:
Colin 2023-08-06 08:11:27 +00:00
parent 75770cd34b
commit 2f53e94cc9
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
overlays/cross.nix
View File

@ -844,24 +844,6 @@ in {
# 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: {
doCheck = false;
nativeBuildInputs = upstream.nativeBuildInputs ++ [

17
pkgs/additional/mepo_1_1/default.nix
View File

@ -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=";
};
})

1
pkgs/default.nix
View File

@ -41,7 +41,6 @@ let
ldd-aarch64 = callPackage ./additional/ldd-aarch64 { };
lightdm-mobile-greeter = callPackage ./additional/lightdm-mobile-greeter { };
linux-megous = callPackage ./additional/linux-megous { };
mepo_1_1 = callPackage ./additional/mepo_1_1 { };
mpv-uosc-latest = callPackage ./additional/mpv-uosc-latest { };
mx-sanebot = callPackage ./additional/mx-sanebot { };
rtl8723cs-firmware = callPackage ./additional/rtl8723cs-firmware { };