treewide: makeSetupHook deps -> propagatedBuildInputs

Artturin 4e3dcf36 8be7ab60

+88 -89
+3 -3
pkgs/applications/editors/vim/plugins/vim-utils.nix
··· 363 363 vimGenDocHook = callPackage ({ vim }: 364 364 makeSetupHook { 365 365 name = "vim-gen-doc-hook"; 366 - deps = [ vim ]; 366 + propagatedBuildInputs = [ vim ]; 367 367 substitutions = { 368 368 vimBinary = "${vim}/bin/vim"; 369 369 inherit rtpPath; ··· 373 373 vimCommandCheckHook = callPackage ({ neovim-unwrapped }: 374 374 makeSetupHook { 375 375 name = "vim-command-check-hook"; 376 - deps = [ neovim-unwrapped ]; 376 + propagatedBuildInputs = [ neovim-unwrapped ]; 377 377 substitutions = { 378 378 vimBinary = "${neovim-unwrapped}/bin/nvim"; 379 379 inherit rtpPath; ··· 383 383 neovimRequireCheckHook = callPackage ({ neovim-unwrapped }: 384 384 makeSetupHook { 385 385 name = "neovim-require-check-hook"; 386 - deps = [ neovim-unwrapped ]; 386 + propagatedBuildInputs = [ neovim-unwrapped ]; 387 387 substitutions = { 388 388 nvimBinary = "${neovim-unwrapped}/bin/nvim"; 389 389 inherit rtpPath;
+5 -5
pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
··· 20 20 dotnetConfigureHook = callPackage ({ }: 21 21 makeSetupHook { 22 22 name = "dotnet-configure-hook"; 23 - deps = [ dotnet-sdk nuget-source ]; 23 + propagatedBuildInputs = [ dotnet-sdk nuget-source ]; 24 24 substitutions = { 25 25 nugetSource = nuget-source; 26 26 inherit runtimeId; ··· 30 30 dotnetBuildHook = callPackage ({ }: 31 31 makeSetupHook { 32 32 name = "dotnet-build-hook"; 33 - deps = [ dotnet-sdk ]; 33 + propagatedBuildInputs = [ dotnet-sdk ]; 34 34 substitutions = { 35 35 inherit buildType runtimeId; 36 36 }; ··· 39 39 dotnetCheckHook = callPackage ({ }: 40 40 makeSetupHook { 41 41 name = "dotnet-check-hook"; 42 - deps = [ dotnet-test-sdk ]; 42 + propagatedBuildInputs = [ dotnet-test-sdk ]; 43 43 substitutions = { 44 44 inherit buildType libraryPath; 45 45 disabledTests = lib.optionalString (disabledTests != []) ··· 54 54 dotnetInstallHook = callPackage ({ }: 55 55 makeSetupHook { 56 56 name = "dotnet-install-hook"; 57 - deps = [ dotnet-sdk ]; 57 + propagatedBuildInputs = [ dotnet-sdk ]; 58 58 substitutions = { 59 59 inherit buildType runtimeId; 60 60 }; ··· 63 63 dotnetFixupHook = callPackage ({ }: 64 64 makeSetupHook { 65 65 name = "dotnet-fixup-hook"; 66 - deps = [ dotnet-runtime ]; 66 + propagatedBuildInputs = [ dotnet-runtime ]; 67 67 substitutions = { 68 68 dotnetRuntime = dotnet-runtime; 69 69 runtimeDeps = libraryPath;
+1 -1
pkgs/build-support/node/build-npm-package/hooks/default.nix
··· 26 26 npmInstallHook = makeSetupHook 27 27 { 28 28 name = "npm-install-hook"; 29 - deps = [ buildPackages.makeWrapper ]; 29 + propagatedBuildInputs = [ buildPackages.makeWrapper ]; 30 30 substitutions = { 31 31 hostNode = "${nodejs}/bin/node"; 32 32 jq = "${buildPackages.jq}/bin/jq";
+6 -6
pkgs/build-support/rust/hooks/default.nix
··· 31 31 cargoBuildHook = callPackage ({ }: 32 32 makeSetupHook { 33 33 name = "cargo-build-hook.sh"; 34 - deps = [ cargo ]; 34 + propagatedBuildInputs = [ cargo ]; 35 35 substitutions = { 36 36 inherit ccForBuild ccForHost cxxForBuild cxxForHost 37 37 rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; ··· 41 41 cargoCheckHook = callPackage ({ }: 42 42 makeSetupHook { 43 43 name = "cargo-check-hook.sh"; 44 - deps = [ cargo ]; 44 + propagatedBuildInputs = [ cargo ]; 45 45 substitutions = { 46 46 inherit rustTargetPlatformSpec; 47 47 }; ··· 50 50 cargoInstallHook = callPackage ({ }: 51 51 makeSetupHook { 52 52 name = "cargo-install-hook.sh"; 53 - deps = [ ]; 53 + propagatedBuildInputs = [ ]; 54 54 substitutions = { 55 55 inherit shortTarget; 56 56 }; ··· 59 59 cargoNextestHook = callPackage ({ }: 60 60 makeSetupHook { 61 61 name = "cargo-nextest-hook.sh"; 62 - deps = [ cargo cargo-nextest ]; 62 + propagatedBuildInputs = [ cargo cargo-nextest ]; 63 63 substitutions = { 64 64 inherit rustTargetPlatformSpec; 65 65 }; ··· 68 68 cargoSetupHook = callPackage ({ }: 69 69 makeSetupHook { 70 70 name = "cargo-setup-hook.sh"; 71 - deps = [ ]; 71 + propagatedBuildInputs = [ ]; 72 72 substitutions = { 73 73 defaultConfig = ../fetchcargo-default-config.toml; 74 74 ··· 117 117 maturinBuildHook = callPackage ({ }: 118 118 makeSetupHook { 119 119 name = "maturin-build-hook.sh"; 120 - deps = [ cargo maturin rustc ]; 120 + propagatedBuildInputs = [ cargo maturin rustc ]; 121 121 substitutions = { 122 122 inherit ccForBuild ccForHost cxxForBuild cxxForHost 123 123 rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec;
+1 -2
pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
··· 11 11 12 12 makeSetupHook { 13 13 name = "make-binary-wrapper-hook"; 14 - 15 - deps = [ dieHook ] 14 + propagatedBuildInputs = [ dieHook ] 16 15 # https://github.com/NixOS/nixpkgs/issues/148189 17 16 ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; 18 17
+26 -26
pkgs/build-support/trivial-builders.nix
··· 594 594 595 595 596 596 /* 597 - Make a package that just contains a setup hook with the given contents. 598 - This setup hook will be invoked by any package that includes this package 599 - as a buildInput. Optionally takes a list of substitutions that should be 600 - applied to the resulting script. 601 - 602 - Examples: 603 - # setup hook that depends on the hello package and runs ./myscript.sh 604 - myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; 605 - 606 - # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the 607 - # bash interpreter. 608 - myhellohookSub = makeSetupHook { 609 - name = "myscript-hook"; 610 - deps = [ hello ]; 611 - substitutions = { bash = "${pkgs.bash}/bin/bash"; }; 612 - meta.platforms = lib.platforms.linux; 613 - } ./myscript.sh; 614 - 615 - # setup hook with a package test 616 - myhellohookTested = makeSetupHook { 617 - name = "myscript-hook"; 618 - deps = [ hello ]; 619 - substitutions = { bash = "${pkgs.bash}/bin/bash"; }; 620 - meta.platforms = lib.platforms.linux; 621 - passthru.tests.greeting = callPackage ./test { }; 622 - } ./myscript.sh; 597 + * Make a package that just contains a setup hook with the given contents. 598 + * This setup hook will be invoked by any package that includes this package 599 + * as a buildInput. Optionally takes a list of substitutions that should be 600 + * applied to the resulting script. 601 + * 602 + * Examples: 603 + * # setup hook that depends on the hello package and runs ./myscript.sh 604 + * myhellohook = makeSetupHook { propagatedBuildInputs = [ hello ]; } ./myscript.sh; 605 + * 606 + * # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the 607 + * # bash interpreter. 608 + * myhellohookSub = makeSetupHook { 609 + * name = "myscript-hook"; 610 + * propagatedBuildInputs = [ hello ]; 611 + * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; 612 + * meta.platforms = lib.platforms.linux; 613 + * } ./myscript.sh; 614 + * 615 + * # setup hook with a package test 616 + * myhellohookTested = makeSetupHook { 617 + * name = "myscript-hook"; 618 + * propagatedBuildInputs = [ hello ]; 619 + * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; 620 + * meta.platforms = lib.platforms.linux; 621 + * passthru.tests.greeting = callPackage ./test { }; 622 + * } ./myscript.sh; 623 623 */ 624 624 makeSetupHook = 625 625 { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook"
+2 -2
pkgs/development/interpreters/lua-5/hooks/default.nix
··· 27 27 luarocksCheckHook = callPackage ({ luarocks }: 28 28 makeSetupHook { 29 29 name = "luarocks-check-hook"; 30 - deps = [ luarocks ]; 30 + propagatedBuildInputs = [ luarocks ]; 31 31 } ./luarocks-check-hook.sh) {}; 32 32 33 33 # luarocks installs data in a non-overridable location. Until a proper luarocks patch, ··· 35 35 luarocksMoveDataFolder = callPackage ({ }: 36 36 makeSetupHook { 37 37 name = "luarocks-move-rock"; 38 - deps = [ ]; 38 + propagatedBuildInputs = [ ]; 39 39 } ./luarocks-move-data.sh) {}; 40 40 }
+1 -1
pkgs/development/interpreters/lua-5/wrap-lua.nix
··· 8 8 # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput 9 9 makeSetupHook { 10 10 name = "wrap-lua-hook"; 11 - deps = [ makeWrapper ]; 11 + propagatedBuildInputs = [ makeWrapper ]; 12 12 substitutions.executable = lua.interpreter; 13 13 substitutions.lua = lua; 14 14 substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
+1 -1
pkgs/development/interpreters/octave/wrap-octave.nix
··· 10 10 # Each of the substitutions is available in the wrap.sh script as @thingSubstituted@ 11 11 makeSetupHook { 12 12 name = "${octave.name}-pkgs-setup-hook"; 13 - deps = [ makeWrapper ]; 13 + propagatedBuildInputs = [ makeWrapper ]; 14 14 substitutions.executable = octave.interpreter; 15 15 substitutions.octave = octave; 16 16 } ./wrap.sh
+15 -15
pkgs/development/interpreters/python/hooks/default.nix
··· 11 11 condaInstallHook = callPackage ({ makePythonHook, gnutar, lbzip2 }: 12 12 makePythonHook { 13 13 name = "conda-install-hook"; 14 - deps = [ gnutar lbzip2 ]; 14 + propagatedBuildInputs = [ gnutar lbzip2 ]; 15 15 substitutions = { 16 16 inherit pythonSitePackages; 17 17 }; ··· 20 20 condaUnpackHook = callPackage ({ makePythonHook }: 21 21 makePythonHook { 22 22 name = "conda-unpack-hook"; 23 - deps = []; 23 + propagatedBuildInputs = []; 24 24 } ./conda-unpack-hook.sh) {}; 25 25 26 26 eggBuildHook = callPackage ({ makePythonHook }: 27 27 makePythonHook { 28 28 name = "egg-build-hook.sh"; 29 - deps = [ ]; 29 + propagatedBuildInputs = [ ]; 30 30 } ./egg-build-hook.sh) {}; 31 31 32 32 eggInstallHook = callPackage ({ makePythonHook, setuptools }: 33 33 makePythonHook { 34 34 name = "egg-install-hook.sh"; 35 - deps = [ setuptools ]; 35 + propagatedBuildInputs = [ setuptools ]; 36 36 substitutions = { 37 37 inherit pythonInterpreter pythonSitePackages; 38 38 }; ··· 41 41 eggUnpackHook = callPackage ({ makePythonHook, }: 42 42 makePythonHook { 43 43 name = "egg-unpack-hook.sh"; 44 - deps = [ ]; 44 + propagatedBuildInputs = [ ]; 45 45 } ./egg-unpack-hook.sh) {}; 46 46 47 47 flitBuildHook = callPackage ({ makePythonHook, flit }: 48 48 makePythonHook { 49 49 name = "flit-build-hook"; 50 - deps = [ flit ]; 50 + propagatedBuildInputs = [ flit ]; 51 51 substitutions = { 52 52 inherit pythonInterpreter; 53 53 }; ··· 56 56 pipBuildHook = callPackage ({ makePythonHook, pip, wheel }: 57 57 makePythonHook { 58 58 name = "pip-build-hook.sh"; 59 - deps = [ pip wheel ]; 59 + propagatedBuildInputs = [ pip wheel ]; 60 60 substitutions = { 61 61 inherit pythonInterpreter pythonSitePackages; 62 62 }; ··· 65 65 pipInstallHook = callPackage ({ makePythonHook, pip }: 66 66 makePythonHook { 67 67 name = "pip-install-hook"; 68 - deps = [ pip ]; 68 + propagatedBuildInputs = [ pip ]; 69 69 substitutions = { 70 70 inherit pythonInterpreter pythonSitePackages; 71 71 }; ··· 74 74 pytestCheckHook = callPackage ({ makePythonHook, pytest }: 75 75 makePythonHook { 76 76 name = "pytest-check-hook"; 77 - deps = [ pytest ]; 77 + propagatedBuildInputs = [ pytest ]; 78 78 substitutions = { 79 79 inherit pythonCheckInterpreter; 80 80 }; ··· 123 123 pythonRelaxDepsHook = callPackage ({ makePythonHook, wheel }: 124 124 makePythonHook { 125 125 name = "python-relax-deps-hook"; 126 - deps = [ wheel ]; 126 + propagatedBuildInputs = [ wheel ]; 127 127 substitutions = { 128 128 inherit pythonInterpreter; 129 129 }; ··· 145 145 setuptoolsBuildHook = callPackage ({ makePythonHook, setuptools, wheel }: 146 146 makePythonHook { 147 147 name = "setuptools-setup-hook"; 148 - deps = [ setuptools wheel ]; 148 + propagatedBuildInputs = [ setuptools wheel ]; 149 149 substitutions = { 150 150 inherit pythonInterpreter pythonSitePackages setuppy; 151 151 }; ··· 154 154 setuptoolsCheckHook = callPackage ({ makePythonHook, setuptools }: 155 155 makePythonHook { 156 156 name = "setuptools-check-hook"; 157 - deps = [ setuptools ]; 157 + propagatedBuildInputs = [ setuptools ]; 158 158 substitutions = { 159 159 inherit pythonCheckInterpreter setuppy; 160 160 }; ··· 171 171 venvShellHook = disabledIf (!isPy3k) (callPackage ({ makePythonHook, ensureNewerSourcesForZipFilesHook }: 172 172 makePythonHook { 173 173 name = "venv-shell-hook"; 174 - deps = [ ensureNewerSourcesForZipFilesHook ]; 174 + propagatedBuildInputs = [ ensureNewerSourcesForZipFilesHook ]; 175 175 substitutions = { 176 176 inherit pythonInterpreter; 177 177 }; ··· 180 180 wheelUnpackHook = callPackage ({ makePythonHook, wheel }: 181 181 makePythonHook { 182 182 name = "wheel-unpack-hook.sh"; 183 - deps = [ wheel ]; 183 + propagatedBuildInputs = [ wheel ]; 184 184 } ./wheel-unpack-hook.sh) {}; 185 185 186 186 wrapPython = callPackage ../wrap-python.nix { ··· 190 190 sphinxHook = callPackage ({ makePythonHook, sphinx, installShellFiles }: 191 191 makePythonHook { 192 192 name = "python${python.pythonVersion}-sphinx-hook"; 193 - deps = [ sphinx installShellFiles ]; 193 + propagatedBuildInputs = [ sphinx installShellFiles ]; 194 194 } ./sphinx-hook.sh) {}; 195 195 }
+1 -1
pkgs/development/interpreters/python/wrap-python.nix
··· 5 5 6 6 makePythonHook { 7 7 name = "wrap-python-hook"; 8 - deps = [ makeWrapper ]; 8 + propagatedBuildInputs = [ makeWrapper ]; 9 9 substitutions.sitePackages = python.sitePackages; 10 10 substitutions.executable = python.interpreter; 11 11 substitutions.python = python.pythonForBuild;
+1 -1
pkgs/development/interpreters/tcl/generic.nix
··· 53 53 libdir = "lib/${libPrefix}"; 54 54 tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { 55 55 name = "tcl-package-hook"; 56 - deps = [ buildPackages.makeWrapper ]; 56 + propagatedBuildInputs = [ buildPackages.makeWrapper ]; 57 57 } ./tcl-package-hook.sh) {}; 58 58 }; 59 59 };
+2 -2
pkgs/development/libraries/qt-5/5.15/default.nix
··· 211 211 212 212 qmake = makeSetupHook { 213 213 name = "qmake-hook"; 214 - deps = [ self.qtbase.dev ]; 214 + propagatedBuildInputs = [ self.qtbase.dev ]; 215 215 substitutions = { 216 216 inherit debug; 217 217 fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; ··· 220 220 221 221 wrapQtAppsHook = makeSetupHook { 222 222 name = "wrap-qt5-apps-hook"; 223 - deps = [ self.qtbase.dev buildPackages.makeWrapper ] 223 + propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeWrapper ] 224 224 ++ lib.optional stdenv.isLinux self.qtwayland.dev; 225 225 } ../hooks/wrap-qt-apps-hook.sh; 226 226 };
+2 -2
pkgs/development/libraries/qt-6/default.nix
··· 141 141 142 142 wrapQtAppsHook = makeSetupHook { 143 143 name = "wrap-qt6-apps-hook"; 144 - deps = [ buildPackages.makeWrapper ]; 144 + propagatedBuildInputs = [ buildPackages.makeWrapper ]; 145 145 } ./hooks/wrap-qt-apps-hook.sh; 146 146 147 147 qmake = makeSetupHook { 148 148 name = "qmake6-hook"; 149 - deps = [ self.qtbase.dev ]; 149 + propagatedBuildInputs = [ self.qtbase.dev ]; 150 150 substitutions = { 151 151 inherit debug; 152 152 fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
+4 -4
pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
··· 18 18 makeSetupHook 19 19 { 20 20 name = "remove-path-dependencies.sh"; 21 - deps = [ ]; 21 + propagatedBuildInputs = [ ]; 22 22 substitutions = { 23 23 # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion 24 24 # because building of tomlkit and its dependencies also use these hooks. ··· 50 50 makeSetupHook 51 51 { 52 52 name = "pip-build-hook.sh"; 53 - deps = [ pip wheel ]; 53 + propagatedBuildInputs = [ pip wheel ]; 54 54 substitutions = { 55 55 inherit pythonInterpreter pythonSitePackages; 56 56 }; ··· 64 64 makeSetupHook 65 65 { 66 66 name = "fixup-hook.sh"; 67 - deps = [ ]; 67 + propagatedBuildInputs = [ ]; 68 68 substitutions = { 69 69 inherit pythonSitePackages; 70 70 filenames = builtins.concatStringsSep " " [ ··· 84 84 makeSetupHook 85 85 { 86 86 name = "wheel-unpack-hook.sh"; 87 - deps = [ ]; 87 + propagatedBuildInputs = [ ]; 88 88 } ./wheel-unpack-hook.sh 89 89 ) 90 90 { };
+1 -1
pkgs/servers/x11/xorg/overrides.nix
··· 26 26 { 27 27 wrapWithXFileSearchPathHook = callPackage ({ makeBinaryWrapper, makeSetupHook, writeScript }: makeSetupHook { 28 28 name = "wrapWithXFileSearchPathHook"; 29 - deps = [ makeBinaryWrapper ]; 29 + propagatedBuildInputs = [ makeBinaryWrapper ]; 30 30 } (writeScript "wrapWithXFileSearchPathHook.sh" '' 31 31 wrapWithXFileSearchPath() { 32 32 paths=(
+13 -13
pkgs/top-level/all-packages.nix
··· 160 160 ### BUILD SUPPORT 161 161 162 162 auditBlasHook = makeSetupHook 163 - { name = "auto-blas-hook"; deps = [ blas lapack ]; } 163 + { name = "auto-blas-hook"; propagatedBuildInputs = [ blas lapack ]; } 164 164 ../build-support/setup-hooks/audit-blas.sh; 165 165 166 166 autoreconfHook = callPackage ( 167 167 { makeSetupHook, autoconf, automake, gettext, libtool }: 168 168 makeSetupHook { 169 169 name = "autoreconf-hook"; 170 - deps = [ autoconf automake gettext libtool ]; 170 + propagatedBuildInputs = [ autoconf automake gettext libtool ]; 171 171 } ../build-support/setup-hooks/autoreconf.sh 172 172 ) { }; 173 173 ··· 184 184 185 185 autoPatchelfHook = makeSetupHook { 186 186 name = "auto-patchelf-hook"; 187 - deps = [ bintools ]; 187 + propagatedBuildInputs = [ bintools ]; 188 188 substitutions = { 189 189 pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; 190 190 autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; ··· 356 356 357 357 gogUnpackHook = makeSetupHook { 358 358 name = "gog-unpack-hook"; 359 - deps = [ innoextract file-rename ]; } 359 + propagatedBuildInputs = [ innoextract file-rename ]; } 360 360 ../build-support/setup-hooks/gog-unpack.sh; 361 361 362 362 buildEnv = callPackage ../build-support/buildenv { }; # not actually a package ··· 1012 1012 1013 1013 makeShellWrapper = makeSetupHook { 1014 1014 name = "make-shell-wrapper-hook"; 1015 - deps = [ dieHook ]; 1015 + propagatedBuildInputs = [ dieHook ]; 1016 1016 substitutions = { 1017 1017 # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) 1018 1018 shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; ··· 1063 1063 1064 1064 shortenPerlShebang = makeSetupHook { 1065 1065 name = "shorten-perl-shebang-hook"; 1066 - deps = [ dieHook ]; 1066 + propagatedBuildInputs = [ dieHook ]; 1067 1067 } ../build-support/setup-hooks/shorten-perl-shebang.sh; 1068 1068 1069 1069 singularity-tools = callPackage ../build-support/singularity-tools { }; ··· 1115 1115 1116 1116 desktopToDarwinBundle = makeSetupHook { 1117 1117 name = "desktop-to-darwin-bundle-hook"; 1118 - deps = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; 1118 + propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; 1119 1119 } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; 1120 1120 1121 1121 keepBuildTree = makeSetupHook { ··· 1128 1128 1129 1129 makeGCOVReport = makeSetupHook { 1130 1130 name = "make-gcov-report-hook"; 1131 - deps = [ lcov enableGCOVInstrumentation ]; 1131 + propagatedBuildInputs = [ lcov enableGCOVInstrumentation ]; 1132 1132 } ../build-support/setup-hooks/make-coverage-analysis-report.sh; 1133 1133 1134 1134 makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; ··· 1163 1163 iconConvTools = callPackage ../build-support/icon-conv-tools {}; 1164 1164 1165 1165 validatePkgConfig = makeSetupHook 1166 - { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } 1166 + { name = "validate-pkg-config"; propagatedBuildInputs = [ findutils pkg-config ]; } 1167 1167 ../build-support/setup-hooks/validate-pkg-config.sh; 1168 1168 1169 1169 patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files {}; ··· 18778 18778 xcbuild = xcodebuild; 18779 18779 xcbuildHook = makeSetupHook { 18780 18780 name = "xcbuild-hook"; 18781 - deps = [ xcbuild ]; 18781 + propagatedBuildInputs = [ xcbuild ]; 18782 18782 } ../development/tools/xcbuild/setup-hook.sh ; 18783 18783 18784 18784 # xcbuild with llvm 6 18785 18785 xcbuild6Hook = makeSetupHook { 18786 18786 name = "xcbuild6-hook"; 18787 - deps = [ xcodebuild6 ]; 18787 + propagatedBuildInputs = [ xcodebuild6 ]; 18788 18788 } ../development/tools/xcbuild/setup-hook.sh ; 18789 18789 18790 18790 xcpretty = callPackage ../development/tools/xcpretty { }; ··· 22049 22049 memorymapping = callPackage ../development/libraries/memorymapping { }; 22050 22050 memorymappingHook = makeSetupHook { 22051 22051 name = "memorymapping-hook"; 22052 - deps = [ memorymapping ]; 22052 + propagatedBuildInputs = [ memorymapping ]; 22053 22053 } ../development/libraries/memorymapping/setup-hook.sh; 22054 22054 22055 22055 memray = callPackage ../development/tools/memray { }; ··· 22057 22057 memstream = callPackage ../development/libraries/memstream { }; 22058 22058 memstreamHook = makeSetupHook { 22059 22059 name = "memstream-hook"; 22060 - deps = [ memstream ]; 22060 + propagatedBuildInputs = [ memstream ]; 22061 22061 } ../development/libraries/memstream/setup-hook.sh; 22062 22062 22063 22063 menu-cache = callPackage ../development/libraries/menu-cache { };
+1 -1
pkgs/top-level/cuda-packages.nix
··· 50 50 autoAddOpenGLRunpathHook = final.callPackage ( { makeSetupHook, addOpenGLRunpath }: 51 51 makeSetupHook { 52 52 name = "auto-add-opengl-runpath-hook"; 53 - deps = [ 53 + propagatedBuildInputs = [ 54 54 addOpenGLRunpath 55 55 ]; 56 56 } ../development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
+2 -2
pkgs/top-level/darwin-packages.nix
··· 121 121 122 122 checkReexportsHook = pkgs.makeSetupHook { 123 123 name = "darwin-check-reexports-hook"; 124 - deps = [ pkgs.darwin.print-reexports ]; 124 + propagatedBuildInputs = [ pkgs.darwin.print-reexports ]; 125 125 } ../os-specific/darwin/print-reexports/setup-hook.sh; 126 126 127 127 sigtool = callPackage ../os-specific/darwin/sigtool { }; ··· 142 142 143 143 autoSignDarwinBinariesHook = pkgs.makeSetupHook { 144 144 name = "auto-sign-darwin-binaries-hook"; 145 - deps = [ self.signingUtils ]; 145 + propagatedBuildInputs = [ self.signingUtils ]; 146 146 } ../os-specific/darwin/signing-utils/auto-sign-hook.sh; 147 147 148 148 maloader = callPackage ../os-specific/darwin/maloader {