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

Commits on Nov 24, 2020

  1. autofs: fix compilation fail due to libtirpc changes

    @SuperSandro2000
    SuperSandro2000 committed Nov 24, 2020
    Copy the full SHA
    4d5ab8d View commit details

Commits on Nov 27, 2020

  1. Merge pull request #104792 from SuperSandro2000/autofs-fix 

    autofs: fix compilation fail due to libtirpc changes
    @Ma27
    Ma27 authored Nov 27, 2020
    Copy the full SHA
    b19ad34 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/os-specific/linux/autofs/default.nix
7 changes: 5 additions & 2 deletions pkgs/os-specific/linux/autofs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:

let
version = "5.1.6";
@@ -28,13 +28,16 @@ in stdenv.mkDerivation {
unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
'';

# configure script is not finding the right path
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];

installPhase = ''
make install SUBDIRS="lib daemon modules man" # all but samples
#make install SUBDIRS="samples" # impure!
'';

buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
openssl cyrus_sasl ];
openssl cyrus_sasl rpcsvc-proto ];

nativeBuildInputs = [ flex bison ];