Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b508327806c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9dab9a79706c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 24, 2019

  1. libfsm: 0.1pre1869_f70c3c5 -> 0.1pre1905_bd5937fa 

    Properly separate the build and install phases for better nix shell
hacking when using `buildPhase` -- and also fix a bug where
`$NIX_BUILD_CORES` wasn't properly passed to `bmake`.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Oct 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9dab9a7 View commit details
Showing with 10 additions and 6 deletions.
  1. +10 −6 pkgs/development/libraries/libfsm/default.nix
16 changes: 10 additions & 6 deletions pkgs/development/libraries/libfsm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "libfsm";
version = "0.1pre1869_${builtins.substring 0 7 src.rev}";
version = "0.1pre1905_${builtins.substring 0 8 src.rev}";

src = fetchFromGitHub {
owner = "katef";
repo = "libfsm";
rev = "f70c3c5778a79eeecb52f9fd35c7cbc241db0ed6";
sha256 = "1hgv272jdv6dwnsdjajyky537z84q0cwzspw9br46qj51h8gkwvx";
repo = pname;
rev = "bd5937fad42b26a86bac1fe3ec49eff73581bd1d";
sha256 = "1q3grbmvjnnvc2sshswbd40cc2j2hnwibmljcqx9jqgda0wd6pgv";
fetchSubmodules = true;
};

@@ -22,12 +22,16 @@ 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 install";
buildPhase = "PREFIX=$out bmake -r -j$NIX_BUILD_CORES";
installPhase = ''
PREFIX=$out bmake -r install
runHook postInstall
'';

# fix up multi-output install. we also have to fix the pkgconfig libdir
# file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in
# our case; libdir should really be set to the $lib output.
installPhase = ''
postInstall = ''
mkdir -p $lib $dev/lib
mv $out/lib $lib/lib