cabal2nix 1.14 → 1.15
raw patch · 3 files changed
+10/−10 lines, 3 files
Files
- cabal2nix.cabal +2/−2
- src/Cabal2Nix.hs +1/−1
- src/Cabal2Nix/PostProcess.hs +7/−7
cabal2nix.cabal view
@@ -1,5 +1,5 @@ Name: cabal2nix-Version: 1.14+Version: 1.15 Copyright: Peter Simons, Andres Loeh License: BSD3 License-File: LICENSE@@ -25,7 +25,7 @@ > Recognized URI schemes: > > cabal://pkgname-pkgversion download the specified package from Hackage- > http://host/path fetch the Cabel file via HTTP+ > http://host/path fetch the Cabal file via HTTP > file:///local/path load the Cabal file from the local disk > /local/path abbreviated version of file URI .
src/Cabal2Nix.hs view
@@ -51,7 +51,7 @@ , "Recognized URI schemes:" , "" , " cabal://pkgname-pkgversion download the specified package from Hackage"- , " http://host/path fetch the Cabel file via HTTP"+ , " http://host/path fetch the Cabal file via HTTP" , " file:///local/path load the Cabal file from the local disk" , " /local/path abbreviated version of file URI" ]
src/Cabal2Nix/PostProcess.hs view
@@ -8,27 +8,27 @@ postProcess :: Derivation -> Derivation postProcess deriv@(MkDerivation {..}) | pname == "alex" = deriv { buildTools = "perl":buildTools }- | pname == "cairo" = deriv { extraLibs = "pkgconfig":"glibc":"cairo":"zlib":extraLibs }+ | pname == "cairo" = deriv { extraLibs = "pkgconfig":"libc":"cairo":"zlib":extraLibs } | pname == "editline" = deriv { extraLibs = "libedit":extraLibs } | pname == "epic" = deriv { extraLibs = "gmp":"boehmgc":extraLibs, buildTools = "happy":buildTools }- | pname == "glade" = deriv { extraLibs = "pkgconfig":"glibc":extraLibs, pkgConfDeps = "gtkC":(delete "gtk" pkgConfDeps) }- | pname == "glib" = deriv { extraLibs = "pkgconfig":"glibc":extraLibs }+ | pname == "glade" = deriv { extraLibs = "pkgconfig":"libc":extraLibs, pkgConfDeps = "gtkC":(delete "gtk" pkgConfDeps) }+ | pname == "glib" = deriv { extraLibs = "pkgconfig":"libc":extraLibs } | pname == "GLUT" = deriv { extraLibs = "glut":"libSM":"libICE":"libXmu":"libXi":"mesa":extraLibs }- | pname == "gtk" = deriv { extraLibs = "pkgconfig":"glibc":extraLibs, buildDepends = delete "gio" buildDepends }- | pname == "gtksourceview2" = deriv { extraLibs = "pkgconfig":"glibc":extraLibs }+ | pname == "gtk" = deriv { extraLibs = "pkgconfig":"libc":extraLibs, buildDepends = delete "gio" buildDepends }+ | pname == "gtksourceview2" = deriv { extraLibs = "pkgconfig":"libc":extraLibs } | pname == "happy" = deriv { buildTools = "perl":buildTools } | pname == "haskell-src" = deriv { buildTools = "happy":buildTools } | pname == "hmatrix" = deriv { extraLibs = "gsl":"liblapack":"blas":extraLibs } | pname == "idris" = deriv { buildTools = "happy":buildTools } | pname == "OpenAL" = deriv { extraLibs = "openal":extraLibs } | pname == "OpenGL" = deriv { extraLibs = "mesa":"libX11":extraLibs }- | pname == "pango" = deriv { extraLibs = "pkgconfig":"glibc":extraLibs }+ | pname == "pango" = deriv { extraLibs = "pkgconfig":"libc":extraLibs } | pname == "persistent" = deriv { extraLibs = "sqlite3":extraLibs } | pname == "repa-examples" = deriv { extraLibs = "llvm":extraLibs } | pname == "SDL-image" = deriv { extraLibs = "SDL_image":extraLibs } | pname == "SDL-mixer" = deriv { extraLibs = "SDL_mixer":extraLibs } | pname == "SDL-ttf" = deriv { extraLibs = "SDL_ttf":extraLibs }- | pname == "svgcairo" = deriv { extraLibs = "glibc":extraLibs }+ | pname == "svgcairo" = deriv { extraLibs = "libc":extraLibs } | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs } | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs } | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs }