treewide: makeWrapper buildInputs to nativeBuildInputs
This commit is contained in:
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ]
|
||||
# if python2 support is requested, it is needed at builtime as well as runtime.
|
||||
++ lib.optionals (enablePython) [ python2 ]
|
||||
;
|
||||
buildInputs = [ perl nss nspr pam intltool makeWrapper ]
|
||||
buildInputs = [ perl nss nspr pam intltool ]
|
||||
++ lib.optionals (enablePython) [ python2 ]
|
||||
;
|
||||
propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin
|
||||
installPhase = ''
|
||||
|
||||
@@ -59,7 +59,8 @@ let
|
||||
maintainers = with maintainers; [ ewok ];
|
||||
};
|
||||
|
||||
buildInputs = [makeWrapper dpkg];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [dpkg];
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
unpackPhase = "dpkg -X $src .";
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot = ".";
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $src .";
|
||||
|
||||
buildInputs = [ makeWrapper jdk ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jdk ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share
|
||||
|
||||
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper perl ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
phases = [ "installPhase" "fixupPhase" ];
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc=";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontPatchELF = true; # stay away from exploit executables
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
phases = "installPhase";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = appName;
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "131jpcwyyzgzjn9lx4k1zn95pd68pjw4i41jfzcp9z9fnazyln5n";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user