diff options
| author | Qyriad <qyriad@qyriad.me> | 2024-03-09 00:44:49 -0700 |
|---|---|---|
| committer | Qyriad <qyriad@qyriad.me> | 2024-03-11 04:26:35 -0600 |
| commit | 529a01ade2b5cd19f0013e1cf030d59dd88532fe (patch) | |
| tree | b4b7dc2793631bc4250bc37ae3a2c10e54c85757 /flake.nix | |
| parent | b072c069b741d5939baf0350d53392197da3b2d7 (diff) | |
package: migrate devShells
Change-Id: Ic63721667edd4bef79aa699a0de8411639e5159b
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 43 |
1 files changed, 16 insertions, 27 deletions
@@ -531,36 +531,25 @@ devShells = let makeShell = pkgs: stdenv: let - canRunInstalled = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + nix = pkgs.callPackage ./package.nix { + inherit stdenv versionSuffix fileset; + boehmgc = pkgs.boehmgc-nix; + busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox; + }; in - with commonDeps { inherit pkgs; }; - stdenv.mkDerivation { - name = "nix"; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = nativeBuildDeps - ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear - ++ lib.optional - (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) - pkgs.buildPackages.clang-tools - # We want changelog-d in the shell even if the current build doesn't need it - ++ lib.optional (officialRelease || ! buildUnreleasedNotes) changelog-d - ; - - buildInputs = buildDeps ++ propagatedDeps - ++ awsDeps ++ checkDeps ++ internalApiDocsDeps; + nix.overrideAttrs (prev: { + nativeBuildInputs = prev.nativeBuildInputs + ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear + ++ lib.optional + (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) + pkgs.buildPackages.clang-tools; - configureFlags = configureFlags - ++ testConfigureFlags ++ internalApiDocsConfigureFlags - ++ lib.optional (!canRunInstalled) "--disable-doc-gen"; + src = null; - enableParallelBuilding = true; + installFlags = "sysconfdir=$(out)/etc"; + strictDeps = false; - installFlags = "sysconfdir=$(out)/etc"; - - shellHook = - '' + shellHook = '' PATH=$prefix/bin:$PATH unset PYTHONPATH export MANPATH=$out/share/man:$MANPATH @@ -568,7 +557,7 @@ # Make bash completion work. XDG_DATA_DIRS+=:$out/share ''; - }; + }); in forAllSystems (system: let |