Unverified Commit 6c3d4833 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

apk-tools: 3.0.3 -> 3.0.4; switch to meson build system (#491113)

parents 9f2cd1e0 6f26f7bd

pkgs/by-name/ap/apk-tools/package.nix

+19 −22
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
  stdenv,

  fetchFromGitLab,

  pkg-config,

  meson,

  ninja,

  python3,

  cmocka,

  scdoc,

  openssl,

  zlib,
@@ -11,49 +15,43 @@ 
  lua5_3,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "apk-tools";

  version = "3.0.3";

  version = "3.0.4";



  src = fetchFromGitLab {

    domain = "gitlab.alpinelinux.org";

    owner = "alpine";

    repo = "apk-tools";

    rev = "v${version}";

    sha256 = "sha256-ydqJiLkz80TQGyf9m/l8HSXfoTAvi0av7LHETk1c0GI=";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-51lBWcUSILCJZNP6LaOGyERCosNWTuEne/+xX8xHLf0=";

  };



  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    scdoc

    python3

  ]

  ++ lib.optionals luaSupport [

    lua5_3

    lua5_3.pkgs.lua-zlib

  ];



  buildInputs = [

    openssl

    zlib

    zstd

    scdoc

    cmocka

  ]

  ++ lib.optional luaSupport lua5_3;

  strictDeps = true;



  makeFlags = [

    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

    "SBINDIR=$(out)/bin"

    "LIBDIR=$(out)/lib"

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

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

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

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

    "INCLUDEDIR=$(out)/include"

    "PKGCONFIGDIR=$(out)/lib/pkgconfig"

  ];

  strictDeps = true;



  env.NIX_CFLAGS_COMPILE = toString [

    "-Wno-error=unused-result"

    "-Wno-error=deprecated-declarations"

  mesonFlags = [

    (lib.mesonEnable "lua" luaSupport)

    (lib.mesonOption "lua_bin" "lua")

  ];



  enableParallelBuilding = true;
@@ -63,7 +61,6 @@ stdenv.mkDerivation rec { 
    description = "Alpine Package Keeper";

    maintainers = [ ];

    license = lib.licenses.gpl2Only;

    platforms = lib.platforms.linux;

    mainProgram = "apk";

  };

}
 
})