diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libsolv | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsolv')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libsolv/default.nix | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 2e5eccf5263b..7e912a6bcad9 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config -, zlib, xz, bzip2, zchunk, zstd +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, zlib +, xz +, bzip2 +, zchunk +, zstd , expat -, withRpm ? !stdenv.isDarwin, rpm +, withRpm ? !stdenv.isDarwin +, rpm , db }: stdenv.mkDerivation rec { - version = "0.7.24"; + version = "0.7.24"; pname = "libsolv"; src = fetchFromGitHub { - owner = "openSUSE"; - repo = "libsolv"; - rev = version; + owner = "openSUSE"; + repo = "libsolv"; + rev = version; sha256 = "sha256-UTVnGJO/9mQF9RwK75hh6IkoP1MwAlFaLCtdYU8uS34="; }; @@ -24,6 +34,7 @@ stdenv.mkDerivation rec { "-DENABLE_ZCHUNK_COMPRESSION=true" "-DWITH_SYSTEM_ZCHUNK=true" ] ++ lib.optionals withRpm [ + "-DENABLE_COMPS=true" "-DENABLE_PUBKEY=true" "-DENABLE_RPMDB=true" "-DENABLE_RPMDB_BYRPMHEADER=true" @@ -36,10 +47,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free package dependency solver"; - homepage = "https://github.com/openSUSE/libsolv"; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/openSUSE/libsolv"; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ copumpkin ]; }; } - |