Compare commits

..

No commits in common. "35259d49993266e79fdf0e48c84b22616402a989" and "80a41ef45de3556fec1bdbae15eef445f3335752" have entirely different histories.

2 changed files with 4 additions and 25 deletions

View file

@ -59,7 +59,7 @@ stdenv.mkDerivation (self: {
"$assemblies" \ "$assemblies" \
${lib.escapeShellArg package} \ ${lib.escapeShellArg package} \
${buildMethod} \ ${buildMethod} \
-${if buildShared then "S" else "s"}uvr "-H$NIX_BUILD_CORES" \ -${if buildShared then "S" else "s"}uvr \
${flagsString} \ ${flagsString} \
$out/${output} $out/${output}

View file

@ -5,8 +5,6 @@
makeWrapper, makeWrapper,
pkg-config, pkg-config,
stdenv, stdenv,
makeDesktopItem,
copyDesktopItems,
# pkg-config dependencies # pkg-config dependencies
libpng, libpng,
@ -62,7 +60,7 @@ in {
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
pkg-config pkg-config
] ++ lib.optional (!self.passthru.bootstrap) copyDesktopItems; ];
buildInputs = uppsrcDependencies ++ lib.optional (!self.passthru.bootstrap) libclang; buildInputs = uppsrcDependencies ++ lib.optional (!self.passthru.bootstrap) libclang;
@ -96,8 +94,8 @@ in {
if self.passthru.bootstrap then '' if self.passthru.bootstrap then ''
make -f umkMakefile -j $NIX_BUILD_CORES "$makeFlagsArray" make -f umkMakefile -j $NIX_BUILD_CORES "$makeFlagsArray"
'' else '' '' else ''
${lib.getExe' selfBootstrap "umk"} uppsrc ide ${buildMethod} -rvs "-H$NIX_BUILD_CORES" ${lib.getExe' selfBootstrap "umk"} uppsrc ide ${buildMethod} -rvs
${lib.getExe' selfBootstrap "umk"} uppsrc umk ${buildMethod} -rvs "-H$NIX_BUILD_CORES" ${lib.getExe' selfBootstrap "umk"} uppsrc umk ${buildMethod} -rvs
'') + '' '') + ''
runHook postBuild runHook postBuild
''; '';
@ -114,29 +112,10 @@ in {
wrapProgram $out/bin/theide \ wrapProgram $out/bin/theide \
--unset WAYLAND_DISPLAY --unset WAYLAND_DISPLAY
mkdir -p $out/share/icons/hicolor/scalable/apps
cp uppsrc/ide/icon.svg $out/share/icons/hicolor/scalable/apps/ultimatepp-theide.svg
for size in 16 32 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
cp uppsrc/ide/icon''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/ultimatepp-theide.png
done
'') + '' '') + ''
runHook postInstall runHook postInstall
''; '';
desktopItems = [
(makeDesktopItem {
name = "ultimatepp-theide";
exec = "theide";
icon = "ultimatepp-theide";
desktopName = "TheIDE";
comment = "The Ultimate++ Framework IDE";
categories = [ "Development" "IDE" ];
terminal = false;
})
];
passthru = { passthru = {
bootstrap = false; bootstrap = false;
inherit uppsrcDependencies; inherit uppsrcDependencies;