Commit 3656b70f authored by Bjørn Forsman's avatar Bjørn Forsman
Browse files

apk-tools: prepare for pkgs/by-name

parent c0212977

pkgs/tools/package-management/apk-tools/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  zlib,

  zstd,

  luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform,

  lua,

  lua5_3,

}:



stdenv.mkDerivation rec {
@@ -28,15 +28,15 @@ stdenv.mkDerivation rec { 
    scdoc

  ]

  ++ lib.optionals luaSupport [

    lua

    lua.pkgs.lua-zlib

    lua5_3

    lua5_3.pkgs.lua-zlib

  ];

  buildInputs = [

    openssl

    zlib

    zstd

  ]

  ++ lib.optional luaSupport lua;

  ++ lib.optional luaSupport lua5_3;

  strictDeps = true;



  makeFlags = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 
    "SBINDIR=$(out)/bin"

    "LIBDIR=$(out)/lib"

    "LUA=${if luaSupport then "lua" else "no"}"

    "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}"

    "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua5_3.version}"

    "MANDIR=$(out)/share/man"

    "DOCDIR=$(out)/share/doc/apk"

    "INCLUDEDIR=$(out)/include"

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -1456,9 +1456,7 @@ with pkgs; 


  angie-console-light = callPackage ../servers/http/angie/console-light.nix { };



  apk-tools = callPackage ../tools/package-management/apk-tools {

    lua = lua5_3;

  };

  apk-tools = callPackage ../tools/package-management/apk-tools { };



  appimage-run = callPackage ../tools/package-management/appimage-run { };

  appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {