From 2ef0816647c77be23ac9de269bf54c3f1cca1c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Thu, 14 Jan 2010 23:21:46 +0000
Subject: [PATCH] Moving the library nixpkgs file/attribute names from
'opensc-dnie' to 'libopensc-dnie'
svn path=/nixpkgs/trunk/; revision=19451
---
.../libraries/{opensc-dnie => libopensc-dnie}/default.nix | 2 +-
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename pkgs/development/libraries/{opensc-dnie => libopensc-dnie}/default.nix (97%)
diff --git a/pkgs/development/libraries/opensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix
similarity index 97%
rename from pkgs/development/libraries/opensc-dnie/default.nix
rename to pkgs/development/libraries/libopensc-dnie/default.nix
index d36a3b157cc7..16c65e33c900 100644
--- a/pkgs/development/libraries/opensc-dnie/default.nix
+++ b/pkgs/development/libraries/libopensc-dnie/default.nix
@@ -5,7 +5,7 @@ zlib}:
assert opensc.name == "opensc-0.11.7";
stdenv.mkDerivation rec {
- name = "opensc-dnie-1.4.6-2";
+ name = "libopensc-dnie-1.4.6-2";
src = if (stdenv.system == "i686-linux") then (fetchurl {
url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6285ea3faeb4..2239e0cf130c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4383,7 +4383,7 @@ let
pkgconfig;
};
- opensc_dnie = import ../development/libraries/opensc-dnie {
+ libopensc_dnie = import ../development/libraries/libopensc-dnie {
inherit fetchurl stdenv patchelf writeScript openssl openct
libtool pcsclite zlib;
inherit (gtkLibs) glib;