public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libtxc_dxtn: get rid of duplicate package, clean up build script.

Browse Source
This commit is contained in:
Evgeny Egorochkin 2013-10-18 22:32:27 +03:00
parent f5f1bfa30a
commit 745a08d4c4
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libtxc_dxtn/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool, mesa }: { stdenv, fetchurl, autoreconfHook, mesa }:
let version = "1.0.1"; in let version = "1.0.1"; in
@ -6,15 +6,14 @@ stdenv.mkDerivation rec {
name = "libtxc_dxtn-${version}"; name = "libtxc_dxtn-${version}";
src = fetchurl { src = fetchurl {
url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz"; url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
}; };
buildInputs = [ autoconf automake libtool mesa ]; buildInputs = [ autoreconfHook mesa ];
preConfigure = "autoreconf -vfi";
meta = { meta = {
homepage = http://dri.freedesktop.org/wiki/S3TC; homepage = http://dri.freedesktop.org/wiki/S3TC;
repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn;
}; };
} }

12
pkgs/development/libraries/libxtc_dxtn/default.nix
View File

@ -1,12 +0,0 @@
{ stdenv, fetchurl, mesa }:
stdenv.mkDerivation rec {
name = "libtxc_dxtn-1.0.1";
src = fetchurl {
url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
};
NIX_CFLAGS_COMPILE = "-I ${mesa}/include";
}

2
pkgs/top-level/all-packages.nix
View File

@ -5099,8 +5099,6 @@ let
libxslt = callPackage ../development/libraries/libxslt { }; libxslt = callPackage ../development/libraries/libxslt { };
libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { };
libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });