git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #368 from cdepillabout/add-vte-to-resolveInNixpkgs

Add override for the vte system library

commitff2693c5bc0097f85bf286823c119a405ae39ccf authorBas van Dijk <v.dijk.bas@gmail.com> dateSun 26 Aug 2018, 14:41 (8 years ago) parenta77f6a75955759
2 files changed+2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+1
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1
@@ -139,6 +139,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
139139 | i == "gtk2" = binding # (i, path # ["pkgs","gnome2","gtk"])
140140 | i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])
141141 | i == "gtksourceview3" = binding # (i, path # ["pkgs","gnome3","gtksourceview"])
142+ | i == "vte_291" = binding # (i, path # ["pkgs","gnome3","vte"])
142143 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
143144 | otherwise = bindNull i
144145
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+1
@@ -147,6 +147,7 @@ libNixName "taglib_c" = return "taglib"
147147libNixName "tensorflow" = return "libtensorflow"
148148libNixName "udev" = return "systemd";
149149libNixName "uuid" = return "libossp_uuid";
150+libNixName "vte-2.91" = return "vte_291"
150151libNixName "wayland-client" = return "wayland"
151152libNixName "wayland-cursor" = return "wayland"
152153libNixName "wayland-egl" = return "libGL"