ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

trivial-builders: move into the directory named alike (#223429)

Browse Source 
While searching for something different I wondered why there is a
trivial-builders.nix file next to the trivial-builders directory where
only tests live. Lets fix that.
This commit is contained in:
Sandro 2023-05-06 00:16:26 +02:00 committed by GitHub
parent 68eb074857
commit cac19e0266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/build-support/trivial-builders.nix → pkgs/build-support/trivial-builders/default.nix
View File

2
pkgs/development/interpreters/lua-5/wrap-lua.nix
View File

@ -4,7 +4,7 @@
, makeWrapper
}:
# defined in trivial-builders.nix
# defined in trivial-builders
# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
makeSetupHook {
name = "wrap-lua-hook";

2
pkgs/development/interpreters/octave/wrap-octave.nix
View File

@ -4,7 +4,7 @@
, makeWrapper
}:
# Defined in trivial-builders.nix
# Defined in trivial-builders
# Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv
# as nativeBuildInput
# Each of the substitutions is available in the wrap.sh script as @thingSubstituted@

2
pkgs/top-level/stage.nix
View File

@ -101,7 +101,7 @@ let
};
trivialBuilders = self: super:
import ../build-support/trivial-builders.nix {
import ../build-support/trivial-builders {
inherit lib;
inherit (self) runtimeShell stdenv stdenvNoCC haskell;
inherit (self.pkgsBuildHost) shellcheck;