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: a634ea874acf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 90691042af87
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 8, 2021

  1. libcap: fix static build 

    It supports static build with SHARED=no; the patch no longer applies.

Tested by building pkgsStatic.libcap.
    @orivej
    orivej committed Apr 8, 2021
    Copy the full SHA
    9069104 View commit details
Showing with 1 addition and 25 deletions.
  1. +1 −3 pkgs/os-specific/linux/libcap/default.nix
  2. +0 −22 pkgs/os-specific/linux/libcap/no-shared-lib.patch
4 changes: 1 addition & 3 deletions pkgs/os-specific/linux/libcap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI=";
};

patches = lib.optional isStatic ./no-shared-lib.patch;

outputs = [ "out" "dev" "lib" "man" "doc" ]
++ lib.optional usePam "pam";

@@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
"PAM_CAP=${if usePam then "yes" else "no"}"
"BUILD_CC=$(CC_FOR_BUILD)"
"CC:=$(CC)"
];
] ++ lib.optional isStatic "SHARED=no";

prePatch = ''
# use full path to bash
22 changes: 0 additions & 22 deletions pkgs/os-specific/linux/libcap/no-shared-lib.patch
View file

This file was deleted.