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: b01289392c84
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f8b310eb84a
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 5, 2019

  1. pacman: use runtimeShell as the scriptlet shell

    @joachifm
    joachifm committed Oct 5, 2019
    1
    Copy the full SHA
    6208273 View commit details

  2. pacman: build with libcurl 

    Obviates the need to specify a custom Xfer command
    @joachifm
    joachifm committed Oct 5, 2019
    Copy the full SHA
    2858e98 View commit details

  3. pacman: parallel building

    @joachifm
    joachifm committed Oct 5, 2019
    Copy the full SHA
    42128d9 View commit details

  4. pacman: set sysconfdir=/etc

    @joachifm
    joachifm committed Oct 5, 2019
    Copy the full SHA
    96d8115 View commit details

Commits on Oct 6, 2019

  1. Merge pull request #70451 from joachifm/feat/pacman-enhancements 

    Pacman packaging enhancements
    @joachifm
    joachifm authored Oct 6, 2019
    Copy the full SHA
    7f8b310 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/tools/package-management/pacman/default.nix
10 changes: 8 additions & 2 deletions pkgs/tools/package-management/pacman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
zlib, bzip2, lzma }:
zlib, bzip2, lzma, curl, runtimeShell }:

stdenv.mkDerivation rec {
pname = "pacman";
@@ -10,15 +10,21 @@ stdenv.mkDerivation rec {
sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
};

enableParallelBuilding = true;

configureFlags = [
# trying to build docs fails with a2x errors, unable to fix through asciidoc
"--disable-doc"

"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-scriptlet-shell=${runtimeShell}"
];

installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ perl libarchive openssl zlib bzip2 lzma ];
buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];

postFixup = ''
substituteInPlace $out/bin/repo-add \