git.iko.soy/typeable/cabal2nix
on master help sign in
Cabal2Nix: improve configuration for git-annex
commitdb1dfdf89b367246092626278792678401b8275e authorPeter Simons <simons@cryp.to> dateMon 3 Jun 2013, 21:54 (13 years ago) parenta5d0a1e
2 files changed+16−2
compare with master
unifiedsplit
src/Cabal2Nix/Flags.hs+4−1 src/Cabal2Nix/PostProcess.hs+12−1
src/Cabal2Nix/Flags.hs+4−1
@@ -7,7 +7,10 @@ configureCabalFlags :: PackageIdentifier -> FlagAssignment
77configureCabalFlags (PackageIdentifier (PackageName name) _)
88 | name == "accelerate-examples"= [disable "opencl"]
99 | name == "pandoc" = [enable "blaze_html_0_5"]
10− | name == "git-annex" = [enable "S3", enable "WebDAV", enable "Inotify", enable "Dbus", enable "Assistant", enable "Webapp", enable "Pairing", enable "XMPP", enable "DNS"]
10+ | name == "git-annex" = [ enable "S3", enable "WebDAV", enable "Inotify"
11+ , enable "Dbus", disable "Assistant", disable "Webapp"
12+ , enable "Pairing", enable "XMPP", enable "DNS"
13+ , enable "Production", enable "TDFA"]
1114 | name == "haskeline" = [enable "terminfo"]
1215 | name == "reactive-banana-wx" = [disable "buildExamples"]
1316 | name == "xmobar" = [enable "with_xft", enable "with_iwlib"]
src/Cabal2Nix/PostProcess.hs+12−1
@@ -16,7 +16,7 @@ postProcess deriv@(MkDerivation {..})
1616 | pname == "editline" = deriv { extraLibs = "libedit":extraLibs }
1717 | pname == "epic" = deriv { extraLibs = "gmp":"boehmgc":extraLibs, buildTools = "happy":buildTools }
1818 | pname == "ghc-mod" = deriv { phaseOverrides = ghcModPostInstall, buildTools = "emacs":buildTools }
19− | pname == "git-annex" = deriv { buildTools = "git":"rsync":"gnupg1":"curl":"lsof":"openssh":"bup":buildTools }
19+ | pname == "git-annex" = deriv { phaseOverrides = gitAnnexOverrides, buildTools = "git":"rsync":"gnupg1":"curl":"lsof":"openssh":"bup":buildTools }
2020 | pname == "glade" = deriv { extraLibs = "pkgconfig":"libc":extraLibs, pkgConfDeps = "gtkC":delete "gtk" pkgConfDeps }
2121 | pname == "glib" = deriv { extraLibs = "pkgconfig":"libc":extraLibs }
2222 | pname == "GLUT" = deriv { extraLibs = "glut":"libSM":"libICE":"libXmu":"libXi":"mesa":extraLibs }
@@ -134,3 +134,14 @@ xmonadPostInstall = unlines
134134 , " mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/"
135135 , "'';"
136136 ]
137+
138+gitAnnexOverrides :: String
139+gitAnnexOverrides = unlines
140+ [ "preConfigure = \"patchShebangs .\";"
141+ , "checkPhase = ''"
142+ , " export HOME=\"$NIX_BUILD_TOP/tmp\""
143+ , " mkdir \"$HOME\""
144+ , " cp dist/build/git-annex/git-annex git-annex"
145+ , " ./git-annex test"
146+ , "'';"
147+ ]