From c182a39498e3b4c9c9a6442a627446f102836be6 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 23 Jan 2022 18:58:53 +0100 Subject: [PATCH] giblib: remove There is no upstream anymore and scrot now uses imlib2 directly --- pkgs/development/libraries/giblib/default.nix | 37 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/development/libraries/giblib/default.nix diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix deleted file mode 100644 index ca4a3c98e0a6..000000000000 --- a/pkgs/development/libraries/giblib/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: - -stdenv.mkDerivation rec { - pname = "giblib"; - version = "1.2.4"; - - src = fetchurl { - url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz"; - sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; - - buildInputs = [ xlibsWrapper ]; - propagatedBuildInputs = [ imlib2 ]; - - postFixup = '' - moveToOutput bin/giblib-config "$dev" - - # Doesn't contain useful stuff - rm -rf $out/share/doc - ''; - - meta = { - homepage = "http://linuxbrit.co.uk/giblib/"; - description = "wrapper library for imlib2, and other stuff"; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7ae975c5cbe7..c51aa2c48074 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -312,6 +312,7 @@ mapAliases ({ gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12 + giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 gitAndTools = self // { # added 2021-01-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b926da829ab..b00958d34a45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16579,8 +16579,6 @@ with pkgs; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; - giblib = callPackage ../development/libraries/giblib { }; - gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; gio-sharp = callPackage ../development/libraries/gio-sharp { };