8001337 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

gi-* packages need to refer to gtk3; a 'gtk' variable no longer exists

commit8001337ecb843cd1f76f01461e0a129779130d07 authorPeter Simons <simons@cryp.to> dateFri 22 Jul 2016, 10:22 (10 years ago) parenteeefc3b

1 file changed+2−4

unifiedsplit

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−4

@@ -262,8 +262,7 @@ giPhaseOverrides

262262

263263giGdkPhaseOverrides :: Derivation -> Derivation

264264giGdkPhaseOverrides

265− = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk.dev"] ++ "'';")

266− . set (libraryDepends . pkgconfig . contains (pkg "gtk3")) True

265+ = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk3.dev"] ++ "'';")

267266

268267giGdkPixBufPhaseOverrides :: Derivation -> Derivation

269268giGdkPixBufPhaseOverrides

@@ -277,8 +276,7 @@ giGdkPixBufPhaseOverrides

277276

278277giGtkPhaseOverrides :: Derivation -> Derivation

279278giGtkPhaseOverrides

280− = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk.dev"] ++ "'';")

281− . set (libraryDepends . pkgconfig . contains (pkg "gtk3")) True

279+ = set phaseOverrides ("preConfigure = ''" ++ exportGirSearchPath ["gtk3.dev"] ++ "'';")

282280

283281giJavascriptCorePhaseOverrides :: Derivation -> Derivation

284282giJavascriptCorePhaseOverrides