@@ -10,17 +10,24 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "free42";
13− version = "3.0.8";
13+ version = "3.0.9";
1414
1515 src = fetchFromGitHub {
1616 owner = "thomasokken";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "sha256-nZCuFumAyeUxRmmtd6/qvXk3LVZgbDhlsDygXMWDfp0=";
19+ hash = "sha256-ZSwqgHsfe9apyYZ1fkvDMnQxdNb9E8U1l9jvC9t693w=";
2020 };
2121
22− nativeBuildInputs = [ copyDesktopItems pkg-config ];
23− buildInputs = [ gtk3 alsa-lib ];
22+ nativeBuildInputs = [
23+ copyDesktopItems
24+ pkg-config
25+ ];
26+
27+ buildInputs = [
28+ alsa-lib
29+ gtk3
30+ ];
2431
2532 postPatch = ''
2633 sed -i -e "s|/bin/ls|ls|" gtk/Makefile
@@ -30,23 +37,24 @@ stdenv.mkDerivation rec {
3037
3138 buildPhase = ''
3239 runHook preBuild
40+
3341 make -C gtk cleaner
3442 make --jobs=$NIX_BUILD_CORES -C gtk
3543 make -C gtk clean
3644 make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1
45+
3746 runHook postBuild
3847 '';
3948
40− preInstall = ''
49+ installPhase = ''
50+ runHook preInstall
51+
4152 install --directory $out/bin \
4253 $out/share/doc/${pname} \
4354 $out/share/${pname}/skins \
4455 $out/share/icons/hicolor/48x48/apps \
4556 $out/share/icons/hicolor/128x128/apps
46− '';
4757
48− installPhase = ''
49− runHook preInstall
5058 install -m755 gtk/free42dec gtk/free42bin $out/bin
5159 install -m644 gtk/README $out/share/doc/${pname}/README-GTK
5260 install -m644 README $out/share/doc/${pname}/README
@@ -54,6 +62,7 @@ stdenv.mkDerivation rec {
5462 install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
5563 install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
5664 install -m644 skins/* $out/share/${pname}/skins
65+
5766 runHook postInstall
5867 '';
5968