diff options
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/dotnetenv/build-solution.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/fetchdocker/generic-fetcher.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate.nix | 11 | ||||
-rw-r--r-- | pkgs/build-support/rust/carnix.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/rust/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/vm/windows/default.nix | 5 |
6 files changed, 1 insertions, 28 deletions
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index b1853bf73641..62370d361cd0 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -14,9 +14,6 @@ assert modifyPublicMain -> mainClassFile != null; -let - wrapperCS = ./Wrapper.cs.in; -in stdenv.mkDerivation { inherit name src; diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix index e051cee08432..3b0c33770467 100644 --- a/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -2,8 +2,6 @@ let awk = "${gawk}/bin/awk"; dockerCredentialsFile = import ./credentials.nix; - stripScheme = - builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; in { fetcher , name diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index be76c283babc..7f21b66ce129 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -187,20 +187,12 @@ let makeDeps = dependencies: crateType, metadata, crateBin, finalBins, extraRustcOpts, verbose, colors }: - let depsDir = lib.concatStringsSep " " dependencies; - completeDepsDir = lib.concatStringsSep " " completeDeps; - completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; - deps = makeDeps dependencies; - optLevel = if release then 3 else 0; + let deps = makeDeps dependencies; rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; - version_ = lib.splitString "-" crateVersion; - versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; - version = lib.splitString "." (lib.head version_); - authors = lib.concatStringsSep ":" crateAuthors; in '' runHook preBuild norm="" @@ -348,7 +340,6 @@ crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, cr preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); - release_ = release; dependencies_ = dependencies; buildDependencies_ = buildDependencies; processedAttrs = [ diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 5b79d607f9d5..22d3fcd0c1fa 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -2,12 +2,6 @@ { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index d7d03aae33ee..59e8c3e7f7ed 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -20,8 +20,6 @@ in assert cargoVendorDir == null -> cargoSha256 != "unset"; let - lib = stdenv.lib; - cargoDeps = if cargoVendorDir == null then fetchcargo { inherit name src srcs sourceRoot cargoUpdateHook; diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index f15752199822..e5ff13f0da9d 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -21,11 +21,6 @@ let in { runInWindowsVM = drv: let - newDrv = drv.override { - stdenv = drv.stdenv.override { - shell = "/bin/sh"; - }; - }; in pkgs.lib.overrideDerivation drv (attrs: let bootstrap = bootstrapper attrs.windowsImage; in { |