diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/cuneiform/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/qrdecode/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 103178fbb396..dcad21290ef5 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -21,14 +21,14 @@ rec { libc = if a.stdenv ? glibc then a.stdenv.glibc else ""; - doCmake = a.FullDepEntry('' + doCmake = a.fullDepEntry('' ensureDir $PWD/builddir cd builddir export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - postInstall = a.FullDepEntry('' + postInstall = a.fullDepEntry('' patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""} $out/bin/cuneiform '') ["minInit" "addInputs" "doMakeInstall"]; diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index bd850a509b4b..515bbb0fcda3 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -2,7 +2,7 @@ args : let lib = args.lib; fetchurl = args.fetchurl; - FullDepEntry = args.FullDepEntry; + fullDepEntry = args.fullDepEntry; version = lib.getAttr ["version"] "0.9.3" args; buildInputs = with args; [ @@ -22,15 +22,15 @@ rec { phaseNames = ["preConfigure" "doConfigure" "doMake" "createDirs" "doMakeInstall" "postInstall"]; - preConfigure = FullDepEntry '' + preConfigure = fullDepEntry '' cd src sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in '' ["doUnpack"]; - postInstall = FullDepEntry '' + postInstall = fullDepEntry '' cp sample/simple/simpletest $out/bin/qrdecode cd .. '' ["doMake"]; - createDirs = FullDepEntry '' + createDirs = fullDepEntry '' ensureDir $out/bin $out/lib $out/include $out/share '' ["defEnsureDir"]; |