Merge pull request #136096 from marsam/add-akku

akku: init at 1.1.0
This commit is contained in:
Mario Rodas 2021-09-01 07:31:51 -05:00 committed by GitHub
commit 8135f2c296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 0 deletions

View file

@ -0,0 +1,41 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }:
stdenv.mkDerivation rec {
pname = "akku";
version = "1.1.0";
src = fetchFromGitLab {
owner = "akkuscm";
repo = "akku";
rev = "v${version}";
sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5";
};
patches = [
# substitute libcurl path
(substituteAll {
src = ./hardcode-libcurl.patch;
libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ guile ];
# Use a dummy package index to boostrap Akku
preBuild = ''
touch bootstrap.db
'';
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
meta = with lib; {
homepage = "https://akkuscm.org/";
description = "Language package manager for Scheme";
changelog = "https://gitlab.com/akkuscm/akku/-/raw/v${version}/NEWS.md";
platforms = platforms.all;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ marsam ];
};
}

View file

@ -0,0 +1,18 @@
--- old/private/http.scm
+++ new/private/http.scm
@@ -101,14 +101,7 @@
;; shouldn't, but it's an old issue.
(log/error "Could not load libcurl. Please install the curl development(!) package.")
(exit 1)))
- (case (os-name)
- ((darwin) (set! libcurl (open-shared-object "libcurl.dylib")))
- ((msys) (set! libcurl (open-shared-object "msys-curl-4")))
- (else
- (guard (exn
- (else
- (set! libcurl (open-shared-object "libcurl.so.3"))))
- (set! libcurl (open-shared-object "libcurl.so.4"))))))
+ (set! libcurl (open-shared-object "@libcurl@")))
(letrec ()
(define %curl_global_init (foreign-procedure libcurl int curl_global_init (long)))
(call %curl_global_init #b11)))

View file

@ -867,6 +867,8 @@ with pkgs;
inherit (plasma5Packages) kdialog;
};
akku = callPackage ../tools/package-management/akku { };
albert = libsForQt5.callPackage ../applications/misc/albert {};
arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {};