Unverified Commit f2ea252d authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #253854: staging-next 2023-09-07

parents dc0d53b0 186767de

doc/stdenv/stdenv.chapter.md

+22 −0
Original line number Diff line number Diff line
@@ -937,6 +937,28 @@ Like `stripDebugList`, but only applies to packages’ target platform. By defau 


Flags passed to the `strip` command applied to the files in the directories listed in `stripDebugList`. Defaults to `-S` (i.e. `--strip-debug`).



##### `stripExclude` {#var-stdenv-stripExclude}



A list of filenames or path patterns to avoid stripping. A file is excluded if its name _or_ path (from the derivation root) matches.



This example prevents all `*.rlib` files from being stripped:



```nix

stdenv.mkDerivation {

  # ...

  stripExclude = [ "*.rlib" ]

}

```



This example prevents files within certain paths from being stripped:



```nix

stdenv.mkDerivation {

  # ...

  stripExclude = [ "lib/modules/*/build/* ]

}

```



##### `dontPatchELF` {#var-stdenv-dontPatchELF}



If set, the `patchelf` command is not used to remove unnecessary `RPATH` entries. Only applies to Linux.

pkgs/applications/audio/ams-lv2/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config

, waf, python3 }:

, wafHook, python3 }:



stdenv.mkDerivation  rec {

  pname = "ams-lv2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec { 
    sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";

  };



  nativeBuildInputs = [ pkg-config waf.hook python3 ];

  nativeBuildInputs = [ pkg-config wafHook python3 ];

  buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];



  meta = with lib; {

pkgs/applications/audio/ardour/6.nix

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
, suil

, taglib

, vamp-plugin-sdk

, waf

, wafHook

, xjadeo

, videoSupport ? true

}:
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec { 
    perl

    pkg-config

    python3

    waf.hook

    wafHook

  ];



  buildInputs = [

pkgs/applications/audio/ardour/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
, suil

, taglib

, vamp-plugin-sdk

, waf

, wafHook

, xjadeo

, videoSupport ? true

}:
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec { 
    perl

    pkg-config

    python3

    waf.hook

    wafHook

  ];



  buildInputs = [

pkgs/applications/audio/fomp/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, lv2, pkg-config, python3, waf }:

{ lib, stdenv, fetchurl, lv2, pkg-config, python3, wafHook }:



stdenv.mkDerivation rec {

  pname = "fomp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8=";

  };



  nativeBuildInputs = [ pkg-config waf.hook ];

  nativeBuildInputs = [ pkg-config wafHook ];

  buildInputs = [ lv2 python3 ];



  meta = with lib; {