Loading pkgs/applications/misc/mepo/default.nix +28 −25 Original line number Diff line number Diff line Loading @@ -4,38 +4,38 @@ , pkg-config , zig , makeWrapper , busybox , curl , SDL2 , SDL2_gfx , SDL2_image , SDL2_ttf , findutils , jq , ncurses , inconsolata-nerdfont , dmenu , xdotool , bemenu , withX11 ? false , gnome , xorg , util-linux , gpsd , geoclue2-with-demo-agent }: let menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ]; in stdenv.mkDerivation rec { stdenv.mkDerivation rec { pname = "mepo"; version = "0.4.2"; version = "1.1"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; hash = "sha256-k6YXaqB3EwbDPlTvijZf10q+IYwt4/MiqGXL495KIcY="; hash = "sha256-OIZ617QLjiTiDwcsn0DnRussYtjDkVyifr2mdSqA98A="; }; nativeBuildInputs = [ pkg-config zig makeWrapper ]; buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf inconsolata-nerdfont jq ncurses ] ++ menuInputs; curl SDL2 SDL2_gfx SDL2_image SDL2_ttf jq ncurses ]; preBuild = '' export HOME=$TMPDIR Loading @@ -54,30 +54,33 @@ in stdenv.mkDerivation rec { runHook preInstall zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install install -d $out/share/man/man1 $out/bin/mepo -docman > $out/share/man/man1/mepo.1 runHook postInstall ''; postInstall = '' wrapProgram $out/bin/mepo_dl.sh\ --suffix PATH : ${lib.makeBinPath [ jq ncurses ]} wrapProgram $out/bin/mepo_ui_helper_menu.sh\ --suffix PATH : ${lib.makeBinPath menuInputs} for script in $(grep -l jq out/bin/mepo_ui_menu_*.sh); do wrapProgram $script --suffix PATH : $out/bin:${lib.makeBinPath [ jq ]} done for prog in $out/bin/mepo*; do if [ ! -f $out/bin/.$(basename $prog)-wrapped ]; then wrapProgram $prog --suffix PATH : $out/bin fi substituteInPlace $out/bin/mepo_ui_menu_user_pin_updater.sh \ --replace /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0 substituteInPlace $out/bin/mepo_ui_central_menu.sh \ --replace "grep mepo_" "grep '^\.mepo_\|^mepo_'" \ --replace " ls " " ls -a " #circumvent wrapping for script detection for program in $out/bin/* ; do wrapProgram $program \ --suffix PATH : $out/bin:${lib.makeBinPath ([ jq ncurses curl busybox findutils util-linux gpsd gnome.zenity xorg.xwininfo ])} done ''; meta = with lib; { description = "Fast, simple, and hackable OSM map viewer"; homepage = "https://sr.ht/~mil/mepo/"; longDescription = '' It is recommended to use the corresponding NixOS module. ''; homepage = "https://mepo.milesalan.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sikmir McSinyx ]; maintainers = with maintainers; [ sikmir McSinyx laalsaas ]; platforms = platforms.linux; }; } pkgs/top-level/all-packages.nix +0 −1 Original line number Diff line number Diff line Loading @@ -30240,7 +30240,6 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; mepo = callPackage ../applications/misc/mepo { }; mepo-x11 = callPackage ../applications/misc/mepo { withX11 = true; }; meshcentral = callPackage ../tools/admin/meshcentral { }; Loading
pkgs/applications/misc/mepo/default.nix +28 −25 Original line number Diff line number Diff line Loading @@ -4,38 +4,38 @@ , pkg-config , zig , makeWrapper , busybox , curl , SDL2 , SDL2_gfx , SDL2_image , SDL2_ttf , findutils , jq , ncurses , inconsolata-nerdfont , dmenu , xdotool , bemenu , withX11 ? false , gnome , xorg , util-linux , gpsd , geoclue2-with-demo-agent }: let menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ]; in stdenv.mkDerivation rec { stdenv.mkDerivation rec { pname = "mepo"; version = "0.4.2"; version = "1.1"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; hash = "sha256-k6YXaqB3EwbDPlTvijZf10q+IYwt4/MiqGXL495KIcY="; hash = "sha256-OIZ617QLjiTiDwcsn0DnRussYtjDkVyifr2mdSqA98A="; }; nativeBuildInputs = [ pkg-config zig makeWrapper ]; buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf inconsolata-nerdfont jq ncurses ] ++ menuInputs; curl SDL2 SDL2_gfx SDL2_image SDL2_ttf jq ncurses ]; preBuild = '' export HOME=$TMPDIR Loading @@ -54,30 +54,33 @@ in stdenv.mkDerivation rec { runHook preInstall zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install install -d $out/share/man/man1 $out/bin/mepo -docman > $out/share/man/man1/mepo.1 runHook postInstall ''; postInstall = '' wrapProgram $out/bin/mepo_dl.sh\ --suffix PATH : ${lib.makeBinPath [ jq ncurses ]} wrapProgram $out/bin/mepo_ui_helper_menu.sh\ --suffix PATH : ${lib.makeBinPath menuInputs} for script in $(grep -l jq out/bin/mepo_ui_menu_*.sh); do wrapProgram $script --suffix PATH : $out/bin:${lib.makeBinPath [ jq ]} done for prog in $out/bin/mepo*; do if [ ! -f $out/bin/.$(basename $prog)-wrapped ]; then wrapProgram $prog --suffix PATH : $out/bin fi substituteInPlace $out/bin/mepo_ui_menu_user_pin_updater.sh \ --replace /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0 substituteInPlace $out/bin/mepo_ui_central_menu.sh \ --replace "grep mepo_" "grep '^\.mepo_\|^mepo_'" \ --replace " ls " " ls -a " #circumvent wrapping for script detection for program in $out/bin/* ; do wrapProgram $program \ --suffix PATH : $out/bin:${lib.makeBinPath ([ jq ncurses curl busybox findutils util-linux gpsd gnome.zenity xorg.xwininfo ])} done ''; meta = with lib; { description = "Fast, simple, and hackable OSM map viewer"; homepage = "https://sr.ht/~mil/mepo/"; longDescription = '' It is recommended to use the corresponding NixOS module. ''; homepage = "https://mepo.milesalan.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sikmir McSinyx ]; maintainers = with maintainers; [ sikmir McSinyx laalsaas ]; platforms = platforms.linux; }; }
pkgs/top-level/all-packages.nix +0 −1 Original line number Diff line number Diff line Loading @@ -30240,7 +30240,6 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; mepo = callPackage ../applications/misc/mepo { }; mepo-x11 = callPackage ../applications/misc/mepo { withX11 = true; }; meshcentral = callPackage ../tools/admin/meshcentral { };