diff options
author | Robert Hensing <robert@roberthensing.nl> | 2022-02-26 13:38:11 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2022-02-26 13:38:11 +0100 |
commit | b4524d8eda7fae5fc81e83286a402a37526220eb (patch) | |
tree | d0890895db3cbc4dcaa327b2c218c71d1414144f /pkgs/development/haskell-modules/make-package-set.nix | |
parent | 46bb6a78dbcf293dc651b8bcb02f16e6d78b24ae (diff) | |
download | nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.tar nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.tar.gz nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.tar.bz2 nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.tar.lz nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.tar.xz nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.tar.zst nixlib-b4524d8eda7fae5fc81e83286a402a37526220eb.zip |
haskellPackages.haskellSrc2nix: stdenvNoCC.mkDerivation -> runCommand
No need to fuss with phases.
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 705a5b3e96f0..86f29e731133 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -124,20 +124,17 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; - in buildPackages.stdenvNoCC.mkDerivation { - name = "cabal2nix-${name}"; + in buildPackages.runCommand "cabal2nix-${name}" { nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ]; preferLocalBuild = true; allowSubstitutes = false; - phases = ["installPhase"]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir -p "$out" - cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" - ''; - }; + } '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + ''; all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} |