Unverified Commit 619b9dd1 authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

Merge pull request #207948 from viraptor/cleanup-nanosaur-build

nanosaur,nanosaur2,otto-matic: cleanup cmake build
parents 98adeacd 89a9ff18
Loading
Loading
Loading
Loading
+3 −12
Original line number Diff line number Diff line
@@ -20,21 +20,12 @@ stdenv.mkDerivation rec {
    SDL2
  ];

  configurePhase = ''
    runHook preConfigure
    cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
    runHook postConfigure
  '';

  buildPhase = ''
    runHook preBuild
    cmake --build build
    runHook postBuild
  '';
  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];

  installPhase = ''
    runHook preInstall
    mv build $out
    mkdir -p "$out/bin"
    mv Nanosaur Data ReadMe.txt "$out/"
    makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out"
    runHook postInstall
  '';
+3 −12
Original line number Diff line number Diff line
@@ -20,21 +20,12 @@ stdenv.mkDerivation rec {
    SDL2
  ];

  configurePhase = ''
    runHook preConfigure
    cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
    runHook postConfigure
  '';

  buildPhase = ''
    runHook preBuild
    cmake --build build
    runHook postBuild
  '';
  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];

  installPhase = ''
    runHook preInstall
    mv build $out
    mkdir -p "$out/bin"
    mv Nanosaur2 Data ReadMe.txt "$out/"
    makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out"
    runHook postInstall
  '';
+9 −8
Original line number Diff line number Diff line
@@ -12,22 +12,23 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

  buildInputs = [
    SDL2
  ];

  nativeBuildInputs = [
    cmake
    makeWrapper
  ];

  buildInputs = [
    SDL2
  ];

  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];

  installPhase = ''
    runHook preInstall

    mkdir -p $out/share/OttoMatic
    mv Data $out/share/OttoMatic
    install -Dm755 {.,$out/bin}/OttoMatic
    wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic"
    mkdir -p "$out/bin"
    mv OttoMatic Data ReadMe.txt "$out/"
    makeWrapper $out/OttoMatic $out/bin/OttoMatic --chdir "$out"

    runHook postInstall
  '';