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

Commits on Nov 19, 2019

  1. dante: fix package under Linux

    @Shados
    Shados committed Nov 19, 2019
    Copy the full SHA
    a2169c3 View commit details

Commits on Jan 12, 2020

  1. Merge pull request #73746 from Shados/fix-dante-libc 

    dante: fix package under Linux
    @markuskowa
    markuskowa authored Jan 12, 2020

    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
    26a4e0e View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/servers/dante/default.nix
4 changes: 3 additions & 1 deletion pkgs/servers/dante/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {

buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];

configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"];
configureFlags = if !stdenv.isDarwin
then [ "--with-libc=libc.so.6" ]
else [ "--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}" ];

dontAddDisableDepTrack = stdenv.isDarwin;