From b055ec84fcf30729743fcc4649cc64b4e9753c8b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 02:49:06 -0300 Subject: [PATCH] Netsurf buildysstem: 1.8 -> 1.9 --- .../misc/netsurf/buildsystem/default.nix | 24 ------------------- .../browsers/netsurf/buildsystem.nix | 24 +++++++++++++++++++ .../networking/browsers/netsurf/default.nix | 5 ++++ 3 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/misc/netsurf/buildsystem/default.nix create mode 100644 pkgs/applications/networking/browsers/netsurf/buildsystem.nix create mode 100644 pkgs/applications/networking/browsers/netsurf/default.nix diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix deleted file mode 100644 index 9d690546102a..000000000000 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - - pname = "netsurf-buildsystem"; - version = "1.8"; - - src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; - sha256 = "0ffdjwskxlnh8sk40qqfgksbb1nrdzfxsshrscra0p4nqpkj98z6"; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; - description = "Build system for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix new file mode 100644 index 000000000000..2d625b725446 --- /dev/null +++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "netsurf-${libname}"; + libname = "buildsystem"; + version = "1.9"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz"; + sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + homepage = "https://www.netsurf-browser.org/"; + description = "NetSurf browser shared build system"; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix new file mode 100644 index 000000000000..338fc58146a9 --- /dev/null +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + buildsystem = callPackage ./buildsystem.nix { }; +})