diff options
Diffstat (limited to 'pkgs/development/libraries/libfsm')
| -rw-r--r-- | pkgs/development/libraries/libfsm/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index 78f1f66623a..f1e704448de 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , bmake }: stdenv.mkDerivation rec { pname = "libfsm"; - version = "0.1pre1905_${builtins.substring 0 8 src.rev}"; + version = "0.1pre2442_${builtins.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "katef"; repo = pname; - rev = "bd5937fad42b26a86bac1fe3ec49eff73581bd1d"; - sha256 = "1q3grbmvjnnvc2sshswbd40cc2j2hnwibmljcqx9jqgda0wd6pgv"; + rev = "9c5095f7364fa464efff6c81fad9b60b19dfcc99"; + sha256 = "1bs51agvrrwqid0slq2svj2yj7kkjdsnv3xsrk8zmf1jbgza6jrm"; fetchSubmodules = true; }; @@ -22,13 +22,9 @@ stdenv.mkDerivation rec { # if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all # cases.) it's unclear exactly what should be done if we want those flags, # but the defaults work fine. - buildPhase = "PREFIX=$out bmake -r -j$NIX_BUILD_CORES"; - installPhase = '' - PREFIX=$out bmake -r install - runHook postInstall - ''; + makeFlags = [ "-r" "PREFIX=$(out)" ]; - # fix up multi-output install. we also have to fix the pkgconfig libdir + # fix up multi-output install. we also have to fix the pkg-config libdir # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in # our case; libdir should really be set to the $lib output. postInstall = '' @@ -47,7 +43,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DFA regular expression library & friends"; homepage = "https://github.com/katef/libfsm"; license = licenses.bsd2; |