treewide: remove libintl hacks
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
|
||||
, orc, alsaLib, libXv, pango, libtheora
|
||||
, cdparanoia, libvisual, libintlOrEmpty
|
||||
, cdparanoia, libvisual, libintl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
orc libXv pango libtheora cdparanoia
|
||||
orc libXv pango libtheora cdparanoia libintl
|
||||
]
|
||||
++ libintlOrEmpty
|
||||
++ stdenv.lib.optional stdenv.isLinux alsaLib
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
|
||||
|
||||
@@ -40,7 +39,5 @@ stdenv.mkDerivation rec {
|
||||
"--disable-cdparanoia"
|
||||
] else null;
|
||||
|
||||
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user