File tree Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change 78
78
++ lib . optionals packageSetupDeps ( map ( p : p . setup . config )
79
79
( lib . filter ( p : p . buildType != "Simple" ) selectedPackages ) ) ;
80
80
81
- name = if lib . length selectedPackages == 1
81
+ identifierName = if lib . length selectedPackages == 1
82
82
then "ghc-shell-for-${ ( lib . head selectedPackages ) . identifier . name } "
83
83
else "ghc-shell-for-packages" ;
84
84
85
+ name = if ( mkDrvArgs . name or null ) == null then identifierName else mkDrvArgs . name ;
86
+
85
87
# We need to remove any dependencies which would bring in selected components (see above).
86
88
packageInputs = removeSelectedInputs ( lib . concatMap ( cfg : cfg . depends ) selectedConfigs )
87
89
++ additionalPackages ;
@@ -104,14 +106,14 @@ let
104
106
doExactConfig = false ;
105
107
} ;
106
108
configFiles = makeConfigFiles {
107
- fullName = args . name or name ;
108
- identifier . name = name ;
109
+ fullName = name ;
110
+ identifier . name = identifierName ;
109
111
inherit component enableDWARF ;
110
112
chooseDrv = p : if withHaddock && p ? haddock then p . haddock else p ;
111
113
} ;
112
114
ghcEnv = ghcForComponent {
113
115
inherit configFiles ;
114
- componentName = name ;
116
+ componentName = identifierName ;
115
117
postInstall = lib . optionalString withHoogle' ''
116
118
ln -s ${ hoogleIndex } /bin/hoogle $out/bin
117
119
'' ;
145
147
mkDrvArgs = builtins . removeAttrs args [ "packages" "components" "additional" "withHoogle" "tools" ] ;
146
148
in
147
149
mkShell ( mkDrvArgs // {
148
- name = if ( mkDrvArgs . name or null ) == null then name else mkDrvArgs . name ;
150
+ inherit name ;
149
151
150
152
buildInputs = systemInputs
151
153
++ mkDrvArgs . buildInputs or [ ] ;
You can’t perform that action at this time.
0 commit comments