git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #410 from jtojnar/no-gnome-aliases

resolveInNixpkgs: stop using GNOME aliases

commit38534b942e49c950c0e7788d54968042f39b1fd5 authorPeter Simons <simons@cryp.to> dateSun 3 Mar 2019, 10:48 (8 years ago) parentd2bed2e6b9bca8
1 file changed+4−4
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+4−4
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+4−4
@@ -136,10 +136,10 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
136136 resolveInNixpkgs :: Identifier -> Binding
137137 resolveInNixpkgs i
138138 | i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i]) -- TODO: evil!
139− | i == "gtk2" = binding # (i, path # ["pkgs","gnome2","gtk"])
140− | i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])
141− | i == "gtksourceview3" = binding # (i, path # ["pkgs","gnome3","gtksourceview"])
142− | i == "vte_291" = binding # (i, path # ["pkgs","gnome3","vte"])
139+ | i == "gtk2" = binding # (i, path # ["pkgs","gtk2"])
140+ | i == "gtk3" = binding # (i, path # ["pkgs","gtk3"])
141+ | i == "gtksourceview3" = binding # (i, path # ["pkgs","gtksourceview3"])
142+ | i == "vte_291" = binding # (i, path # ["pkgs","vte"])
143143 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
144144 | otherwise = bindNull i
145145