From b06a3b1fcbe65f2ede386524d1db7d9b48117f11 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 03:02:31 -0300 Subject: [PATCH] Netsurf libnsbmp: 0.1.6 -> 0.1.6 --- .../networking/browsers/netsurf/default.nix | 1 + .../browsers/netsurf/libnsbmp.nix} | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/applications/{misc/netsurf/libnsbmp/default.nix => networking/browsers/netsurf/libnsbmp.nix} (63%) diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index 91177b29e2e..d9559f38a7b 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -2,5 +2,6 @@ lib.makeScope pkgs.newScope (self: with self; { buildsystem = callPackage ./buildsystem.nix { }; + libnsbmp = callPackage ./libnsbmp.nix { }; libparserutils = callPackage ./libparserutils.nix { }; }) diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix similarity index 63% rename from pkgs/applications/misc/netsurf/libnsbmp/default.nix rename to pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 8a7e8b60741..95487eed00f 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -3,20 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnsbmp"; version = "0.1.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r"; + sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - buildsystem - ]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -24,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/"; description = "BMP Decoder for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; }