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

haskellPackages.cabal2nix-unstable: use correct output on Darwin

Browse Source 
cabal2nix doesn't have a separate bin output, but cabal2nix-unstable
does (now?), so copying over the code doesn't work. Just stop hardcoding
the bin output in both cases.
This commit is contained in:
sternenseemann
2025-09-22 02:20:21 +02:00
parent b8b6b30ae0
commit ec426cc387
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-darwin.nix
+4 -4
View File
@@ -356,18 +356,18 @@ self: super:
# the latter in the future!
cabal2nix = overrideCabal (old: {
postInstall = ''
remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"
remove-references-to -t ${self.hpack} "''${!outputBin}/bin/cabal2nix"
# Note: The `data` output is needed at runtime.
remove-references-to -t ${self.distribution-nixpkgs.out} "$out/bin/hackage2nix"
remove-references-to -t ${self.distribution-nixpkgs.out} "''${!outputBin}/bin/hackage2nix"
${old.postInstall or ""}
'';
}) super.cabal2nix;
cabal2nix-unstable = overrideCabal (old: {
postInstall = ''
remove-references-to -t ${self.hpack} "$out/bin/cabal2nix"
remove-references-to -t ${self.hpack} "''${!outputBin}/bin/cabal2nix"
# Note: The `data` output is needed at runtime.
remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "$out/bin/hackage2nix"
remove-references-to -t ${self.distribution-nixpkgs-unstable.out} "''${!outputBin}/bin/hackage2nix"
${old.postInstall or ""}
'';