diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-04 10:08:35 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-04 10:11:04 +0000 |
| commit | 9820cb1bf24254199db05856bbb4919378ac75cb (patch) | |
| tree | 6c6bfeb09e5799573e7546419e3496a6fcf0863a /pkgs/applications/graphics/sane | |
| parent | aadaa913792b0fdeb68b02425e4f03d2f8286a1f (diff) | |
| download | nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.tar nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.tar.gz nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.tar.bz2 nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.tar.lz nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.tar.xz nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.tar.zst nixpkgs-9820cb1bf24254199db05856bbb4919378ac75cb.zip | |
use dontBuild instead of hacks
changes: * buildPhase = "true" * buildPhase = ":"
Diffstat (limited to 'pkgs/applications/graphics/sane')
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/brscan4/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix | 9 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 7b22e88bb84..8561c2a4ccf 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,12 +1,6 @@ { stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }: -/* - - -*/ - let - myPatchElf = file: with stdenv.lib; '' patchelf --set-interpreter \ ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ @@ -15,10 +9,7 @@ let udevRules = callPackage ./udev_rules_type1.nix {}; -in - -stdenv.mkDerivation rec { - +in stdenv.mkDerivation rec { name = "brscan4-0.4.3-3"; src = fetchurl { url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; @@ -32,8 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; buildInputs = [ libusb ]; - buildPhase = ":"; - + dontBuild = true; patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} @@ -47,7 +37,6 @@ stdenv.mkDerivation rec { ''; installPhase = '' - PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 873240e81fc..da136a7f9e1 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: - stdenv.mkDerivation rec { - name = "brother-udev-rule-type1-1.0.0-1"; src = fetchurl { @@ -10,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi"; }; - buildInputs = [ ]; + dontBuild = true; unpackPhase = '' ar x $src @@ -37,9 +35,6 @@ stdenv.mkDerivation rec { sed -i -e s/SYSFS/ATTR/g opt/brother/scanner/udev-rules/type1/*.rules ''; - - buildPhase = ":"; - installPhase = '' mkdir -p $out/etc/udev/rules.d cp opt/brother/scanner/udev-rules/type1/NN-brother-mfp-type1.rules \ @@ -57,4 +52,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; -} \ No newline at end of file +} |