lol

stdenv: fix missing dependencies in __sandboxProfile and __impureHostDeps

Fixes: 7f3ca3e21a22 (stdenv: Fix handling of dependencies and hooks)
Fixes: #237458

+7 -15
-5
pkgs/applications/audio/musescore/default.nix
··· 84 84 "--set-default QT_QPA_PLATFORM xcb" 85 85 ]; 86 86 87 - # HACK `propagatedSandboxProfile` does not appear to actually propagate the 88 - # sandbox profile from `qtbase`, see: 89 - # https://github.com/NixOS/nixpkgs/issues/237458 90 - sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; 91 - 92 87 nativeBuildInputs = [ 93 88 wrapQtAppsHook 94 89 cmake
-3
pkgs/applications/misc/qtpass/default.nix
··· 23 23 24 24 nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; 25 25 26 - # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase` 27 - sandboxProfile = toString qtbase.__propagatedSandboxProfile; 28 - 29 26 qmakeFlags = [ 30 27 # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: 31 28 "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
-3
pkgs/development/libraries/qtkeychain/default.nix
··· 23 23 24 24 dontWrapQtApps = true; 25 25 26 - # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qtbase` 27 - sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; 28 - 29 26 cmakeFlags = [ 30 27 "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}" 31 28 "-DQT_TRANSLATIONS_DIR=share/qt/translations"
+7 -4
pkgs/stdenv/generic/make-derivation.nix
··· 413 413 requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; 414 414 } // optionalAttrs (stdenv.buildPlatform.isDarwin) ( 415 415 let 416 + allDependencies = concatLists (concatLists dependencies); 417 + allPropagatedDependencies = concatLists (concatLists propagatedDependencies); 418 + 416 419 computedSandboxProfile = 417 420 concatMap (input: input.__propagatedSandboxProfile or []) 418 421 (stdenv.extraNativeBuildInputs 419 422 ++ stdenv.extraBuildInputs 420 - ++ concatLists dependencies); 423 + ++ allDependencies); 421 424 422 425 computedPropagatedSandboxProfile = 423 426 concatMap (input: input.__propagatedSandboxProfile or []) 424 - (concatLists propagatedDependencies); 427 + allPropagatedDependencies; 425 428 426 429 computedImpureHostDeps = 427 430 unique (concatMap (input: input.__propagatedImpureHostDeps or []) 428 431 (stdenv.extraNativeBuildInputs 429 432 ++ stdenv.extraBuildInputs 430 - ++ concatLists dependencies)); 433 + ++ allDependencies)); 431 434 432 435 computedPropagatedImpureHostDeps = 433 436 unique (concatMap (input: input.__propagatedImpureHostDeps or []) 434 - (concatLists propagatedDependencies)); 437 + allPropagatedDependencies); 435 438 in { 436 439 inherit __darwinAllowLocalNetworking; 437 440 # TODO: remove `unique` once nix has a list canonicalization primitive