lol

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

+5 -20
+5 -6
pkgs/development/libraries/libtxc_dxtn/default.nix
··· 1 - { stdenv, fetchurl, autoconf, automake, libtool, mesa }: 1 + { stdenv, fetchurl, autoreconfHook, mesa }: 2 2 3 3 let version = "1.0.1"; in 4 4 ··· 6 6 name = "libtxc_dxtn-${version}"; 7 7 8 8 src = fetchurl { 9 - url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz"; 10 - sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv"; 9 + url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; 10 + sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; 11 11 }; 12 12 13 - buildInputs = [ autoconf automake libtool mesa ]; 14 - 15 - preConfigure = "autoreconf -vfi"; 13 + buildInputs = [ autoreconfHook mesa ]; 16 14 17 15 meta = { 18 16 homepage = http://dri.freedesktop.org/wiki/S3TC; 17 + repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; 19 18 }; 20 19 }
-12
pkgs/development/libraries/libxtc_dxtn/default.nix
··· 1 - { stdenv, fetchurl, mesa }: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "libtxc_dxtn-1.0.1"; 5 - 6 - src = fetchurl { 7 - url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; 8 - sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; 9 - }; 10 - 11 - NIX_CFLAGS_COMPILE = "-I ${mesa}/include"; 12 - }
-2
pkgs/top-level/all-packages.nix
··· 5099 5099 5100 5100 libxslt = callPackage ../development/libraries/libxslt { }; 5101 5101 5102 - libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { }; 5103 - 5104 5102 libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { 5105 5103 inherit fetchurl stdenv; 5106 5104 });