git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112330 from alyssais/apk-tools

apk-tools: 2.10.5 -> 2.12.2; fix cross

commit6dbcdd2bc19d4377a250c73e658445426de64957 authorSandro <sandro.jaeckel@gmail.com> dateMon 8 Feb 2021, 00:28 (6 years ago) parent513269027f273d
1 file changed+17−8
pkgs/tools/package-management/apk-tools/default.nix+17−8
pkgs/tools/package-management/apk-tools/default.nix+17−8
@@ -1,20 +1,29 @@
1−{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }:
1+{ lib, stdenv, fetchFromGitLab, pkg-config, scdoc, openssl, zlib
2+, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, lua
3+}:
24
35stdenv.mkDerivation rec {
46 pname = "apk-tools";
5− version = "2.10.5";
7+ version = "2.12.2";
68
7− src = fetchurl {
8− url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz";
9− sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp";
9+ src = fetchFromGitLab {
10+ domain = "gitlab.alpinelinux.org";
11+ owner = "alpine";
12+ repo = "apk-tools";
13+ rev = "v${version}";
14+ sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29";
1015 };
1116
12− nativeBuildInputs = [ pkg-config ];
13− buildInputs = [ lua openssl zlib ];
17+ nativeBuildInputs = [ pkg-config scdoc ]
18+ ++ lib.optionals luaSupport [ lua lua.pkgs.lua-zlib ];
19+ buildInputs = [ openssl zlib ] ++ lib.optional luaSupport lua;
20+ strictDeps = true;
1421
1522 makeFlags = [
23+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
1624 "SBINDIR=$(out)/bin"
1725 "LIBDIR=$(out)/lib"
26+ "LUA=${if luaSupport then "lua" else "no"}"
1827 "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}"
1928 "MANDIR=$(out)/share/man"
2029 "DOCDIR=$(out)/share/doc/apk"
@@ -30,7 +39,7 @@ stdenv.mkDerivation rec {
3039 homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools";
3140 description = "Alpine Package Keeper";
3241 maintainers = with maintainers; [ qyliss ];
33− license = licenses.gpl2;
42+ license = licenses.gpl2Only;
3443 platforms = platforms.unix;
3544 broken = stdenv.isDarwin;
3645 };