From f141586b64f43727546f57e175935c9187e2e9d4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 21 Jun 2021 03:38:12 +0300 Subject: [PATCH 1/2] robo3t: refactor and add keyword --- pkgs/applications/misc/robo3t/default.nix | 31 ++++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 1b19d9ab9cc0..41f3475a645f 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, curl, zlib, glib, xorg, dbus, fontconfig, libGL, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: +{ lib +, stdenv +, fetchurl +, curl +, zlib +, glib +, xorg +, dbus +, fontconfig +, libGL +, freetype +, xkeyboard_config +, makeDesktopItem +, makeWrapper +}: let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; @@ -30,7 +43,7 @@ stdenv.mkDerivation rec { categories = "Development;IDE;"; }; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc @@ -51,6 +64,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + BASEDIR=$out/lib/robo3t mkdir -p $BASEDIR/bin @@ -72,13 +87,15 @@ stdenv.mkDerivation rec { makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb + + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; + description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eperuffo ]; }; } From 19b8fd7321dd90b236217a4c2738d4d6a848ad88 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 21 Jun 2021 03:39:59 +0300 Subject: [PATCH 2/2] robomongo has been aliased to robo3t since 2017-09-28 --- pkgs/applications/misc/robomongo/default.nix | 77 -------------------- 1 file changed, 77 deletions(-) delete mode 100644 pkgs/applications/misc/robomongo/default.nix diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix deleted file mode 100644 index af5285909c6c..000000000000 --- a/pkgs/applications/misc/robomongo/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "robomongo"; - version = "0.9.0"; - - src = fetchurl { - url = "https://download.robomongo.org/${version}/linux/robomongo-${version}-linux-x86_64-0786489.tar.gz"; - sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad"; - }; - - icon = fetchurl { - url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png"; - sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2"; - }; - - desktopItem = makeDesktopItem { - name = "robomongo"; - exec = "robomongo"; - icon = icon; - comment = "Query GUI for mongodb"; - desktopName = "Robomongo"; - genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; - }; - - nativeBuildInputs = [makeWrapper]; - - ldLibraryPath = lib.makeLibraryPath [ - stdenv.cc.cc - zlib - glib - xorg.libXi - xorg.libxcb - xorg.libXrender - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXext - dbus - fontconfig - freetype - ]; - - installPhase = '' - BASEDIR=$out/lib/robomongo - - mkdir -p $BASEDIR/bin - cp bin/* $BASEDIR/bin - - mkdir -p $BASEDIR/lib - cp -r lib/* $BASEDIR/lib - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications - - mkdir -p $out/share/icons - cp ${icon} $out/share/icons/robomongo.png - - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robomongo - - mkdir $out/bin - - makeWrapper $BASEDIR/bin/robomongo $out/bin/robomongo \ - --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb - ''; - - meta = { - homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; - platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; - }; -}