git.iko.soy/typeable/cabal2nix
on master help sign in
bustle: fix the license, drop dependency on gio-unix, and fix meta.hydraPlatforms
commitc9d1e8a29bd51d2f4b914bc0b60e6796551b5c74 authorPeter Simons <simons@cryp.to> dateFri 31 Jan 2020, 21:36 (7 years ago) parent25c72e7
1 file changed+8−1
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+8−1
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+8−1
@@ -13,6 +13,7 @@ import Data.Set ( Set )
1313import qualified Data.Set as Set
1414import Distribution.Nixpkgs.Haskell
1515import Distribution.Nixpkgs.Meta
16+import Distribution.Nixpkgs.License
1617import Distribution.Package
1718import Distribution.System
1819import Distribution.Text
@@ -78,7 +79,7 @@ hooks =
7879 , ("alsa-core", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))
7980 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))
8081 , ("bindings-lxc", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))
81− , ("bustle", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
82+ , ("bustle", bustleOverrides)
8283 , ("Cabal", set doCheck False) -- test suite doesn't work in Nix
8384 , ("Cabal >2.2", over (setupDepends . haskell) (Set.union (Set.fromList [self "mtl", self "parsec"]))) -- https://github.com/haskell/cabal/issues/5391
8485 , ("cabal-helper", set doCheck False) -- https://github.com/DanielG/cabal-helper/issues/17
@@ -400,3 +401,9 @@ pandocOverrides = set phaseOverrides postInstall
400401 , " mv \"man/\"*.1 $out/share/man/man1/"
401402 , "'';"
402403 ]
404+
405+bustleOverrides :: Derivation -> Derivation
406+bustleOverrides = set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True
407+ . set (executableDepends . pkgconfig . contains "gio-unix = null") False
408+ . set (metaSection . license) (Known "stdenv.lib.licenses.lgpl21Plus")
409+ . set (metaSection . hydraPlatforms) allKnownPlatforms