Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c921dbb2d9f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f8b6de730172
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 24, 2021

  1. rpm: add zstd support

    @rb2k
    rb2k committed Jan 24, 2021
    Copy the full SHA
    9a7efb2 View commit details

Commits on Jan 25, 2021

  1. Merge pull request #110713 from rb2k/zstd_support_for_rpm 

    rpm: add zstd support
    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f8b6de7 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/tools/package-management/rpm/default.nix
5 changes: 3 additions & 2 deletions pkgs/tools/package-management/rpm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchpatch
, pkg-config, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
, sqlite
, sqlite, zstd
}:

stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];

nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];

# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
"--enable-python"
"--enable-ndb"
"--enable-sqlite"
"--enable-zstd"
"--localstatedir=/var"
"--sharedstatedir=/com"
];