colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeBinaryWrapper: Make tests discoverable to OfBorg

Browse Source 
Move makeBinaryWrapper tests to pkgs.makeBinaryWrapper.passthru.tests, since OfBorg doesn't discover/skips the tests in the previous location.
This commit is contained in:
Tobias Bergkvist 2021-12-10 19:41:18 +01:00
parent 3104da4085
commit f7b5083cb6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/test/default.nix
View File

@ -35,8 +35,6 @@ with pkgs;
macOSSierraShared = callPackage ./macos-sierra-shared {};
make-binary-wrapper = callPackage ./make-binary-wrapper { inherit makeBinaryWrapper; };
cross = callPackage ./cross {};
php = recurseIntoAttrs (callPackages ./php {});

5
pkgs/top-level/all-packages.nix
View File

@ -696,7 +696,10 @@ with pkgs;
--replace " @CC@ " " ${cc}/bin/cc ${san} "
'';
in
makeSetupHook { deps = [ dieHook ]; } script;
makeSetupHook {
deps = [ dieHook ];
substitutions.passthru.tests = callPackage ../test/make-binary-wrapper { inherit makeBinaryWrapper; };
} script;
in
lib.makeOverridable f {
cc = stdenv.cc;