nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 20:14:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Domen Kožar 2017-03-28 09:59:41 +02:00
parent deb73f214c
commit c80a791dd5
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -4713,9 +4713,11 @@ in
all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
haxe = callPackage ../development/compilers/haxe {
inherit (ocamlPackages) camlp4;
};
inherit (ocamlPackages) haxe;
purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
@ -12702,6 +12704,8 @@ in
cyclone = callPackage ../applications/audio/pd-plugins/cyclone { };
d4x = callPackage ../applications/misc/d4x { };
darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: {
configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
});