From 24513e08d7e773b1b81b7baed9e70e371f888666 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 20 Aug 2018 19:35:29 +0200 Subject: [PATCH] geany: fix license geany-with-vte: inherit meta data from geany --- pkgs/applications/editors/geany/default.nix | 2 +- pkgs/applications/editors/geany/with-vte.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index ed77e6f4b47..24954a602cc 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = https://www.geany.org/; - license = "GPL"; + license = licenses.gpl2; maintainers = []; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 7689ebad0f0..ac35560c7f6 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " +runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib